svn commit: samba r4926 - branches/SAMBA_3_0/source/passdb trunk/source/passdb

[gd at samba.org]

Author: gd
Date: 2005-01-22 04:09:21 +0000 (Sat, 22 Jan 2005)
New Revision: 4926

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4926

Log:
Use LDAP_SCOPE_ONELEVEL instead of OpenLDAP's LDAP_SCOPE_ONE-scope.

Guenther

Modified:
   branches/SAMBA_3_0/source/passdb/pdb_ldap.c
   trunk/source/passdb/pdb_ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/pdb_ldap.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_ldap.c	2005-01-22 03:37:09 UTC (rev 4925)
+++ branches/SAMBA_3_0/source/passdb/pdb_ldap.c	2005-01-22 04:09:21 UTC (rev 4926)
@@ -2921,7 +2921,7 @@
 
 search:		
 	rc = smbldap_search(ldap_state->smbldap_state, base,
-			    LDAP_SCOPE_ONE, filter, attrs, 0, &result);
+			    LDAP_SCOPE_ONELEVEL, filter, attrs, 0, &result);
 
 	if (rc != LDAP_SUCCESS) 
 		return ntstatus;
@@ -3033,7 +3033,7 @@
 		get_global_sam_name(), lp_ldap_suffix());
 		
 	rc = smbldap_search(ldap_state->smbldap_state, base,
-			    LDAP_SCOPE_ONE, filter, attrs, 0, &result);
+			    LDAP_SCOPE_ONELEVEL, filter, attrs, 0, &result);
 
 	if (rc != LDAP_SUCCESS) 
 		return ntstatus;

Modified: trunk/source/passdb/pdb_ldap.c
===================================================================
--- trunk/source/passdb/pdb_ldap.c	2005-01-22 03:37:09 UTC (rev 4925)
+++ trunk/source/passdb/pdb_ldap.c	2005-01-22 04:09:21 UTC (rev 4926)
@@ -2711,7 +2711,7 @@
 
 search:		
 	rc = smbldap_search(ldap_state->smbldap_state, base,
-			    LDAP_SCOPE_ONE, filter, attrs, 0, &result);
+			    LDAP_SCOPE_ONELEVEL, filter, attrs, 0, &result);
 
 	if (rc != LDAP_SUCCESS) 
 		return ntstatus;
@@ -2823,7 +2823,7 @@
 		get_global_sam_name(), lp_ldap_suffix());
 		
 	rc = smbldap_search(ldap_state->smbldap_state, base,
-			    LDAP_SCOPE_ONE, filter, attrs, 0, &result);
+			    LDAP_SCOPE_ONELEVEL, filter, attrs, 0, &result);
 
 	if (rc != LDAP_SUCCESS) 
 		return ntstatus;