Rev 637: merge from volker in http://samba.org/~tridge/3_0-ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 637
revision-id: tridge at samba.org-20071005052653-9t1k5zugt2bif20g
parent: tridge at samba.org-20071005014834-a60dtesnpkdro0w8
parent: vl at samba.org-20070824113213-rmkmzyskz76e3e2x
committer: Andrew Tridgell <tridge at samba.org>
branch nick: s3-ctdb-tridge
timestamp: Fri 2007-10-05 15:26:53 +1000
message:
  merge from volker
modified:
  source/nsswitch/idmap_ldap.c   idmap_ldap.c-20070210173807-1wjifrbwaz6xnmgl-708
    ------------------------------------------------------------
    revno: 607.1.1
    revision-id: vl at samba.org-20070824113213-rmkmzyskz76e3e2x
    parent: tridge at samba.org-20070820002154-hh2wpibu9vk0ixcy
    committer: Volker Lendecke <vl at samba.org>
    branch nick: tridge-3_0
    timestamp: Fri 2007-08-24 13:32:13 +0200
    message:
      Fix a memory leak in idmap_ldap, upstream revision 24649.
    modified:
      source/nsswitch/idmap_ldap.c   idmap_ldap.c-20070210173807-1wjifrbwaz6xnmgl-708
=== modified file 'source/nsswitch/idmap_ldap.c'
--- a/source/nsswitch/idmap_ldap.c	2007-04-28 05:06:56 +0000
+++ b/source/nsswitch/idmap_ldap.c	2007-08-24 11:32:13 +0000
@@ -890,7 +890,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 */
@@ -1107,7 +1107,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 */