rpms/nss_ldap/devel pam_ldap-183-releaseconfig.patch, NONE, 1.1 nss_ldap.spec, 1.112, 1.113

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25234

Modified Files:
	nss_ldap.spec 
Added Files:
	pam_ldap-183-releaseconfig.patch 
Log Message:
fix some minor leaks in pam_ldap, part of upstream #326

pam_ldap-183-releaseconfig.patch:
 pam_ldap.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

--- NEW FILE pam_ldap-183-releaseconfig.patch ---
diff -up pam_ldap/pam_ldap.c pam_ldap/pam_ldap.c
--- pam_ldap/pam_ldap.c	2009-07-22 15:55:42.000000000 -0400
+++ pam_ldap/pam_ldap.c	2009-07-22 16:00:23.000000000 -0400
@@ -437,6 +437,7 @@ static void
 _release_config (pam_ldap_config_t ** pconfig)
 {
   pam_ldap_config_t *c;
+  pam_ssd_t *ssd, *next_ssd;
 
   c = *pconfig;
   if (c == NULL)
@@ -445,6 +446,9 @@ _release_config (pam_ldap_config_t ** pc
   if (c->configFile != NULL)
     free (c->configFile);
 
+  if (c->uri != NULL)
+    free (c->uri);
+
   if (c->host != NULL)
     free (c->host);
 
@@ -474,6 +478,16 @@ _release_config (pam_ldap_config_t ** pc
       free (c->sslpath);
     }
 
+  ssd = c->ssd;
+  while ( ssd != NULL )
+    {
+      next_ssd = ssd->next;
+      free (ssd->base);
+      free (ssd->filter);
+      free (ssd);
+      ssd = next_ssd;
+    }
+
   if (c->userattr != NULL)
     {
       free (c->userattr);
@@ -509,6 +523,36 @@ _release_config (pam_ldap_config_t ** pc
       free (c->logdir);
     }
 
+  if (c->tls_cacertfile != NULL)
+    {
+      free (c->tls_cacertfile);
+    }
+
+  if (c->tls_cacertdir != NULL)
+    {
+      free (c->tls_cacertdir);
+    }
+
+  if (c->tls_ciphers != NULL)
+    {
+      free (c->tls_ciphers);
+    }
+
+  if (c->tls_cert != NULL)
+    {
+      free (c->tls_cert);
+    }
+
+  if (c->tls_key != NULL)
+    {
+      free (c->tls_key);
+    }
+
+  if (c->tls_randfile != NULL)
+    {
+      free (c->tls_randfile);
+    }
+
   if (c->sasl_mechanism != NULL)
     {
       free (c->sasl_mechanism);


Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -p -r1.112 -r1.113
--- nss_ldap.spec	8 Jul 2009 17:37:14 -0000	1.112
+++ nss_ldap.spec	22 Jul 2009 20:07:46 -0000	1.113
@@ -2,7 +2,7 @@
 Summary: NSS library and PAM module for LDAP
 Name: nss_ldap
 Version: 264
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.padl.com/pub/nss_ldap-%{version}.tar.gz
 Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
 Source3: nss_ldap.versions
@@ -26,6 +26,7 @@ Patch19: pam_ldap-184-broken-sasl-rebind
 Patch20: pam_ldap-184-nsrole.patch
 Patch21: nss_ldap-264-checkcase.patch
 Patch22: nss_ldap-264-ent_internal.patch
+Patch23: pam_ldap-183-releaseconfig.patch
 
 URL: http://www.padl.com/
 License: LGPLv2+
@@ -80,6 +81,7 @@ pushd pam_ldap-%{pam_ldap_version}
 %patch16 -p1 -b .referral-passwd2
 %patch19 -p1 -b .broken-sasl-rebind
 %patch20 -p1 -b .nsrole
+%patch23 -p1 -b .releaseconfig
 autoreconf -f -i
 popd
 
@@ -194,6 +196,9 @@ fi
 %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema
 
 %changelog
+* Wed Jul 22 2009 Nalin Dahyabhai <nalin at redhat.com> 264-5
+- fix some minor leaks in pam_ldap, part of upstream #326
+
 * Tue Jul  7 2009 Nalin Dahyabhai <nalin at redhat.com> - 264-4
 - add proposed patch for upstream #322: crashing in oneshot mode