From bc69bd82b05ea862e759746ba81eccb2671c50f0 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Thu, 27 May 2010 21:20:29 +0000
Subject: [PATCH] - update to 0.7.6

---
 .cvsignore                  |  2 ++
 nss-pam-ldapd-default.patch | 54 -------------------------------------
 nss-pam-ldapd.spec          |  9 ++++---
 sources                     |  4 +--
 4 files changed, 9 insertions(+), 60 deletions(-)
 delete mode 100644 nss-pam-ldapd-default.patch

diff --git a/.cvsignore b/.cvsignore
index 34c451a..f60aae6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,5 @@ nss-pam-ldapd-0.7.3.tar.gz.sig
 nss-pam-ldapd-0.7.4.tar.gz
 nss-pam-ldapd-0.7.4.tar.gz.sig
 nss-pam-ldapd-0.7.5.tar.gz.sig
+nss-pam-ldapd-0.7.6.tar.gz
+nss-pam-ldapd-0.7.6.tar.gz.sig
diff --git a/nss-pam-ldapd-default.patch b/nss-pam-ldapd-default.patch
deleted file mode 100644
index 86f9bad..0000000
--- a/nss-pam-ldapd-default.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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	(revision 1111)
-@@ -251,20 +251,25 @@
-   return values[0];
- }
- 
--MUST_USE const char *attmap_get_value(MYLDAP_ENTRY *entry,const char *attr,char *buffer,size_t buflen)
-+const char *attmap_get_value(MYLDAP_ENTRY *entry,const char *attr,char *buffer,size_t buflen)
- {
-   const char **values;
-+  /* check and clear buffer */
-+  if ((buffer==NULL)||(buflen<=0))
-+    return NULL;
-+  buffer[0]='\0';
-   /* for simple values just return the attribute */
-   if (attr[0]!='"')
-   {
-     values=myldap_get_values(entry,attr);
--    if (values==NULL)
-+    if ((values==NULL)||(values[0]==NULL))
-       return NULL;
-     strncpy(buffer,values[0],buflen);
-     buffer[buflen-1]='\0';
-     return buffer;
-     /* TODO: maybe warn when multiple values are found */
-   }
-+  /* we have an expression, try to parse */
-   if ( (attr[strlen(attr)-1]!='"') ||
-        (expr_parse(attr+1,buffer,buflen,entry_expand,(void *)entry)==NULL) )
-   {
-Index: nslcd/attmap.h
-===================================================================
---- nslcd/attmap.h	(revision 1110)
-+++ nslcd/attmap.h	(revision 1111)
-@@ -86,11 +86,11 @@
- 
- /* Set the attribute mapping of the variable to the value specified.
-    Returns the new value on success. */
-+MUST_USE const char *attmap_set_mapping(const char **var,const char *value);
- 
--const char *attmap_set_mapping(const char **var,const char *value);
--
- /* Return a value for the attribute, handling the case where attr
--   is an expression. */
-+   is an expression. On error (e.g. problem parsing expression, attribute
-+   value not found) it returns NULL and the buffer is made empty. */
- const char *attmap_get_value(MYLDAP_ENTRY *entry,const char *attr,char *buffer,size_t buflen);
- 
- /* Add the attributes from attr to the set. The attr argumenent
diff --git a/nss-pam-ldapd.spec b/nss-pam-ldapd.spec
index 01457c4..31b1139 100644
--- a/nss-pam-ldapd.spec
+++ b/nss-pam-ldapd.spec
@@ -1,6 +1,6 @@
 Name:		nss-pam-ldapd
-Version:	0.7.5
-Release:	3%{?dist}
+Version:	0.7.6
+Release:	1%{?dist}
 Summary:	An nsswitch module which uses directory servers
 Group:		System Environment/Base
 License:	LGPLv2+
@@ -8,7 +8,6 @@ URL:		http://arthurdejong.org/nss-pam-ldapd/
 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
@@ -31,7 +30,6 @@ nsswitch module.
 
 %prep
 %setup -q
-%patch0 -p0 -b .default
 
 %build
 %configure --libdir=/%{_lib} --disable-pam
@@ -157,6 +155,9 @@ fi
 exit 0
 
 %changelog
+* Thu May 27 2010 Nalin Dahyabhai <nalin@redhat.com> 0.7.6-1
+- update to 0.7.6
+
 * Mon May 17 2010 Nalin Dahyabhai <nalin@redhat.com> 0.7.5-3
 - switch to the upstream patch for #592411
 
diff --git a/sources b/sources
index aafda52..81df26b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-969dcab16a43b066cdf57633ebdf1124  nss-pam-ldapd-0.7.5.tar.gz
-eec4bcf141706adea1baba67e2529d95  nss-pam-ldapd-0.7.5.tar.gz.sig
+44aab952978fe193d65a14d3631c7957  nss-pam-ldapd-0.7.6.tar.gz
+27da4d6e4eb6155f750b0660c72163da  nss-pam-ldapd-0.7.6.tar.gz.sig