rpms/nss-pam-ldapd/F-13 nss-pam-ldapd-default.patch, NONE, 1.1 nss-pam-ldapd.spec, 1.4, 1.5

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/extras/rpms/nss-pam-ldapd/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10287/F-13

Modified Files:
	nss-pam-ldapd.spec 
Added Files:
	nss-pam-ldapd-default.patch 
Log Message:
- don't return an uninitialized buffer as the value for an optional attribute
  that isn't present in the directory server entry (#592411)


nss-pam-ldapd-default.patch:
 attmap.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE nss-pam-ldapd-default.patch ---
Store an empty string in the passed-in buffer, even if we don't manage to get
the desired value from the entry.

Index: nslcd/attmap.c
===================================================================
--- nslcd/attmap.c	(revision 1110)
+++ nslcd/attmap.c	(working copy)
@@ -254,6 +254,8 @@
 MUST_USE const char *attmap_get_value(MYLDAP_ENTRY *entry,const char *attr,char *buffer,size_t buflen)
 {
   const char **values;
+  if (buflen > 0)
+    buffer[0]='\0';
   /* for simple values just return the attribute */
   if (attr[0]!='"')
   {


Index: nss-pam-ldapd.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-pam-ldapd/F-13/nss-pam-ldapd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- nss-pam-ldapd.spec	14 May 2010 21:09:28 -0000	1.4
+++ nss-pam-ldapd.spec	14 May 2010 22:07:03 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		nss-pam-ldapd
 Version:	0.7.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An nsswitch module which uses directory servers
 Group:		System Environment/Base
 License:	LGPLv2+
@@ -8,6 +8,7 @@ URL:		http://arthurdejong.org/nss-pam-ld
 Source0:	http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-%{version}.tar.gz
 Source1:	http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-%{version}.tar.gz.sig
 Source2:	nslcd.init
+Patch0:		nss-pam-ldapd-default.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openldap-devel, krb5-devel
 Obsoletes:	nss-ldapd < 0.7
@@ -30,6 +31,7 @@ nsswitch module.
 
 %prep
 %setup -q
+%patch0 -p0 -b .default
 
 %build
 %configure --libdir=/%{_lib} --disable-pam
@@ -155,6 +157,10 @@ fi
 exit 0
 
 %changelog
+* Fri May 14 2010 Nalin Dahyabhai <nalin at redhat.com> 0.7.5-2
+- don't return an uninitialized buffer as the value for an optional attribute
+  that isn't present in the directory server entry (#592411)
+
 * Fri May 14 2010 Nalin Dahyabhai <nalin at redhat.com> 0.7.5-1
 - update to 0.7.5