svn commit: samba r24649 - in branches: SAMBA_3_0_25/source/nsswitch SAMBA_3_2/source/nsswitch SAMBA_3_2_0/source/nsswitch

[vlendec at samba.org]

Author: vlendec
Date: 2007-08-24 11:25:38 +0000 (Fri, 24 Aug 2007)
New Revision: 24649

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

Log:
Attempt to fix bug 4917. Simo, please check!

Thanks Patrick Rynhart for reporting this.

Modified:
   branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c
   branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c	2007-08-24 06:29:20 UTC (rev 24648)
+++ branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c	2007-08-24 11:25:38 UTC (rev 24649)
@@ -894,7 +894,7 @@
 	uidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_UIDNUMBER);
 	gidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_GIDNUMBER);
 
-	attr_list = get_attr_list(ctx, sidmap_attr_list);
+	attr_list = get_attr_list(memctx, sidmap_attr_list);
 
 	if ( ! ids[1]) {
 		/* if we are requested just one mapping use the simple filter */
@@ -1111,7 +1111,7 @@
 	uidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_UIDNUMBER);
 	gidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_GIDNUMBER);
 
-	attr_list = get_attr_list(ctx, sidmap_attr_list);
+	attr_list = get_attr_list(memctx, sidmap_attr_list);
 
 	if ( ! ids[1]) {
 		/* if we are requested just one mapping use the simple filter */

Modified: branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c
===================================================================
--- branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c	2007-08-24 06:29:20 UTC (rev 24648)
+++ branches/SAMBA_3_2/source/nsswitch/idmap_ldap.c	2007-08-24 11:25:38 UTC (rev 24649)
@@ -896,7 +896,7 @@
 	uidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_UIDNUMBER);
 	gidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_GIDNUMBER);
 
-	attr_list = get_attr_list(ctx, sidmap_attr_list);
+	attr_list = get_attr_list(memctx, sidmap_attr_list);
 
 	if ( ! ids[1]) {
 		/* if we are requested just one mapping use the simple filter */
@@ -1113,7 +1113,7 @@
 	uidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_UIDNUMBER);
 	gidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_GIDNUMBER);
 
-	attr_list = get_attr_list(ctx, sidmap_attr_list);
+	attr_list = get_attr_list(memctx, sidmap_attr_list);
 
 	if ( ! ids[1]) {
 		/* if we are requested just one mapping use the simple filter */

Modified: branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c
===================================================================
--- branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c	2007-08-24 06:29:20 UTC (rev 24648)
+++ branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c	2007-08-24 11:25:38 UTC (rev 24649)
@@ -893,7 +893,7 @@
 	uidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_UIDNUMBER);
 	gidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_GIDNUMBER);
 
-	attr_list = get_attr_list(ctx, sidmap_attr_list);
+	attr_list = get_attr_list(memctx, sidmap_attr_list);
 
 	if ( ! ids[1]) {
 		/* if we are requested just one mapping use the simple filter */
@@ -1110,7 +1110,7 @@
 	uidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_UIDNUMBER);
 	gidNumber = get_attr_key2string(idpool_attr_list, LDAP_ATTR_GIDNUMBER);
 
-	attr_list = get_attr_list(ctx, sidmap_attr_list);
+	attr_list = get_attr_list(memctx, sidmap_attr_list);
 
 	if ( ! ids[1]) {
 		/* if we are requested just one mapping use the simple filter */