svn commit: samba r18464 - in branches/SAMBA_3_0/source/libads: .

[vlendec at samba.org]

Author: vlendec
Date: 2006-09-13 11:40:21 +0000 (Wed, 13 Sep 2006)
New Revision: 18464

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

Log:
Solaris has LDAP_SCOPE_ONELEVEL. Linux seems to have it as well.

Fix a C++ compat warning.

Volker

Modified:
   branches/SAMBA_3_0/source/libads/ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ldap.c	2006-09-13 11:39:40 UTC (rev 18463)
+++ branches/SAMBA_3_0/source/libads/ldap.c	2006-09-13 11:40:21 UTC (rev 18464)
@@ -2925,13 +2925,14 @@
 	ads_memfree(ads, hostnameDN);
 	if (rc != LDAP_SUCCESS) {
 		const char *attrs[] = { "cn", NULL };
-		void *msg_sub;
+		LDAPMessage *msg_sub;
 
 		/* we only search with scope ONE, we do not expect any further
 		 * objects to be created deeper */
 
-		status = ads_do_search_retry(ads, hostnameDN, LDAP_SCOPE_ONE,
-					"(objectclass=*)", attrs, &res);
+		status = ads_do_search_retry(ads, hostnameDN,
+					     LDAP_SCOPE_ONELEVEL,
+					     "(objectclass=*)", attrs, &res);
 
 		if (!ADS_ERR_OK(status)) {
 			SAFE_FREE(host);
@@ -2963,8 +2964,9 @@
 		}
 
 		/* there should be no subordinate objects anymore */
-		status = ads_do_search_retry(ads, hostnameDN, LDAP_SCOPE_ONE,
-					"(objectclass=*)", attrs, &res);
+		status = ads_do_search_retry(ads, hostnameDN,
+					     LDAP_SCOPE_ONELEVEL,
+					     "(objectclass=*)", attrs, &res);
 
 		if (!ADS_ERR_OK(status) || ( (ads_count_replies(ads, res)) > 0 ) ) {
 			SAFE_FREE(host);