- update to 0.7.6
This commit is contained in:
parent
ead6827240
commit
bc69bd82b0
@ -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
|
||||||
nss-pam-ldapd-0.7.4.tar.gz.sig
|
nss-pam-ldapd-0.7.4.tar.gz.sig
|
||||||
nss-pam-ldapd-0.7.5.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
|
||||||
|
@ -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
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: nss-pam-ldapd
|
Name: nss-pam-ldapd
|
||||||
Version: 0.7.5
|
Version: 0.7.6
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: An nsswitch module which uses directory servers
|
Summary: An nsswitch module which uses directory servers
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
License: LGPLv2+
|
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
|
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
|
Source1: http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-%{version}.tar.gz.sig
|
||||||
Source2: nslcd.init
|
Source2: nslcd.init
|
||||||
Patch0: nss-pam-ldapd-default.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: openldap-devel, krb5-devel
|
BuildRequires: openldap-devel, krb5-devel
|
||||||
Obsoletes: nss-ldapd < 0.7
|
Obsoletes: nss-ldapd < 0.7
|
||||||
@ -31,7 +30,6 @@ nsswitch module.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p0 -b .default
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --libdir=/%{_lib} --disable-pam
|
%configure --libdir=/%{_lib} --disable-pam
|
||||||
@ -157,6 +155,9 @@ fi
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%changelog
|
%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
|
* Mon May 17 2010 Nalin Dahyabhai <nalin@redhat.com> 0.7.5-3
|
||||||
- switch to the upstream patch for #592411
|
- switch to the upstream patch for #592411
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user