sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

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

Browse Source 
Fix a C++ compat warning.

Volker
(This used to be commit 351e583f66)
This commit is contained in:
Volker Lendecke 2006-09-13 11:40:21 +00:00 committed by Gerald (Jerry) Carter
parent 1d71f023bb
commit dfa62cfa98
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source3/libads/ldap.c
View File

@ -2925,13 +2925,14 @@ ADS_STATUS ads_leave_realm(ADS_STRUCT *ads, const char *hostname)
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 @@ ADS_STATUS ads_leave_realm(ADS_STRUCT *ads, const char *hostname)
}
/* 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);