svn commit: samba r22340 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch

[jerry at samba.org]

Author: jerry
Date: 2007-04-18 16:45:00 +0000 (Wed, 18 Apr 2007)
New Revision: 22340

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

Log:
Fix another segfault in idmap_ldap.c caused by setting the iterator
LDAPMessage * to NULL on each loop rotation.


Modified:
   branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c	2007-04-18 14:43:05 UTC (rev 22339)
+++ branches/SAMBA_3_0/source/nsswitch/idmap_ldap.c	2007-04-18 16:45:00 UTC (rev 22340)
@@ -1028,6 +1028,7 @@
 
 static NTSTATUS idmap_ldap_sids_to_unixids(struct idmap_domain *dom, struct id_map **ids)
 {
+       	LDAPMessage *entry = NULL;
 	NTSTATUS ret;
 	TALLOC_CTX *memctx;
 	struct idmap_ldap_context *ctx;
@@ -1108,7 +1109,6 @@
 	}
 
 	for (i = 0; i < count; i++) {
-		LDAPMessage *entry = NULL;
 		char *sidstr = NULL;
 		char *tmp = NULL;
 		enum id_type type;

Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c	2007-04-18 14:43:05 UTC (rev 22339)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c	2007-04-18 16:45:00 UTC (rev 22340)
@@ -1025,6 +1025,7 @@
 
 static NTSTATUS idmap_ldap_sids_to_unixids(struct idmap_domain *dom, struct id_map **ids)
 {
+       	LDAPMessage *entry = NULL;
 	NTSTATUS ret;
 	TALLOC_CTX *memctx;
 	struct idmap_ldap_context *ctx;
@@ -1105,7 +1106,6 @@
 	}
 
 	for (i = 0; i < count; i++) {
-		LDAPMessage *entry = NULL;
 		char *sidstr = NULL;
 		char *tmp = NULL;
 		enum id_type type;