From a5fdfc5094cc4631946581bba42547f024fb2517 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@fedoraproject.org>
Date: Fri, 24 Aug 2007 18:02:18 +0000
Subject: [PATCH] make: `clog' is up to date.

---
 samba.spec                      |  7 ++++++-
 samba3_idmap_ldap_memleak.patch | 35 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 samba3_idmap_ldap_memleak.patch

diff --git a/samba.spec b/samba.spec
index 6ab2b8b..4d3096e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -2,7 +2,7 @@ Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
 Version: 3.0.25c
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -42,6 +42,7 @@ Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
 Patch210: samba-3.0.25-imdap-basedn.patch
+Patch211: samba3_idmap_ldap_memleak.patch
 Patch300: samba3-glibc-open.patch
 
 
@@ -161,6 +162,7 @@ cp %{SOURCE11} packaging/Fedora/
 %patch111 -p1 -b .smbclient
 %patch200 -p0 -b .inotify
 %patch210 -p1 -b .idmap_basedn
+%patch211 -p0 -b .idmap_ldap_memleak
 %patch300 -p0 -b .glibc_open
 
 # crap
@@ -644,6 +646,9 @@ exit 0
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Tue Aug 24 2007 Simo Sorce <ssorce@redhat.com> 3.0.25c-4.fc8
+- add fix reported upstream for heavy idmap_ldap memleak
+
 * Tue Aug 21 2007 Simo Sorce <ssorce@redhat.com> 3.0.25c-3.fc8
 - fix a few places were "open" is used an interfere with the new glibc
 
diff --git a/samba3_idmap_ldap_memleak.patch b/samba3_idmap_ldap_memleak.patch
new file mode 100644
index 0000000..3ffdbde
--- /dev/null
+++ b/samba3_idmap_ldap_memleak.patch
@@ -0,0 +1,35 @@
+Author: vlendec
+Revision: r24649
+Modified: /branches/SAMBA_3_0_25/source/nsswitch/idmap_ldap.c source/nsswitch/idmap_ldap.c /branches/SAMBA_3_2_0/source/nsswitch/idmap_ldap.c
+Added: 
+Removed: 
+
+
+Attempt to fix bug 4917. Simo, please check!
+
+Thanks Patrick Rynhart for reporting this.
+
+
+Index: source/nsswitch/idmap_ldap.c
+===================================================================
+--- source/nsswitch/idmap_ldap.c	(revision 24648)
++++ source/nsswitch/idmap_ldap.c	(revision 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 */
+