svn commit: samba r15704 - branches/SAMBA_3_0/source/libads trunk/source/libads

[gd at samba.org]

Author: gd
Date: 2006-05-18 22:34:16 +0000 (Thu, 18 May 2006)
New Revision: 15704

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

Log:
Prefer LDAP error codes in ads_search_retry_sid().

Guenther

Modified:
   branches/SAMBA_3_0/source/libads/ldap_utils.c
   trunk/source/libads/ldap_utils.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap_utils.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ldap_utils.c	2006-05-18 22:13:03 UTC (rev 15703)
+++ branches/SAMBA_3_0/source/libads/ldap_utils.c	2006-05-18 22:34:16 UTC (rev 15704)
@@ -154,12 +154,12 @@
 	
 	sid_string = sid_binstring_hex(sid);
 	if (sid_string == NULL) {
-		return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+		return ADS_ERROR(LDAP_NO_MEMORY);
 	}
 
 	if (!asprintf(&dn, "<SID=%s>", sid_string)) {
 		SAFE_FREE(sid_string);
-		return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+		return ADS_ERROR(LDAP_NO_MEMORY);
 	}
 
 	status = ads_do_search_retry(ads, dn, LDAP_SCOPE_BASE,

Modified: trunk/source/libads/ldap_utils.c
===================================================================
--- trunk/source/libads/ldap_utils.c	2006-05-18 22:13:03 UTC (rev 15703)
+++ trunk/source/libads/ldap_utils.c	2006-05-18 22:34:16 UTC (rev 15704)
@@ -154,12 +154,12 @@
 	
 	sid_string = sid_binstring_hex(sid);
 	if (sid_string == NULL) {
-		return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+		return ADS_ERROR(LDAP_NO_MEMORY);
 	}
 
 	if (!asprintf(&dn, "<SID=%s>", sid_string)) {
 		SAFE_FREE(sid_string);
-		return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+		return ADS_ERROR(LDAP_NO_MEMORY);
 	}
 
 	status = ads_do_search_retry(ads, dn, LDAP_SCOPE_BASE,