svn commit: samba r14263 - in trunk/source/passdb: .

idra at samba.org idra at samba.org
Mon Mar 13 00:10:42 GMT 2006


Author: idra
Date: 2006-03-13 00:10:40 +0000 (Mon, 13 Mar 2006)
New Revision: 14263

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

Log:

We should simply not talloc_free(0 here at all as now the memory context is
not managed by this function.
Remove also unneeded check as the funtion always return the same value.

Simo.


Modified:
   trunk/source/passdb/pdb_ldap.c


Changeset:
Modified: trunk/source/passdb/pdb_ldap.c
===================================================================
--- trunk/source/passdb/pdb_ldap.c	2006-03-13 00:08:44 UTC (rev 14262)
+++ trunk/source/passdb/pdb_ldap.c	2006-03-13 00:10:40 UTC (rev 14263)
@@ -1438,10 +1438,7 @@
 					    LDAP_ATTR_MOD_TIMESTAMP));
 			append_attr(mem_ctx, &attr_list, "uidNumber");
 			rc = ldapsam_search_suffix_by_sid(ldap_state, mem_ctx, sid, result, attr_list);
-			talloc_free(mem_ctx);
 
-			if (rc != LDAP_SUCCESS) 
-				return rc;
 			break;
 		}
 			
@@ -1453,10 +1450,7 @@
 			attr_list = get_userattr_list(NULL,
 						      ldap_state->schema_ver);
 			rc = ldapsam_search_suffix_by_rid(ldap_state, mem_ctx, rid, result, attr_list);
-			talloc_free(mem_ctx);
 
-			if (rc != LDAP_SUCCESS) 
-				return rc;
 			break;
 	}
 	return rc;



More information about the samba-cvs mailing list