Rebase to 0.7.14

* rebase the validname patch to apply on 0.7.14
* obsolete the buffers patch
This commit is contained in:
Jakub Hrozek 2011-09-22 13:13:19 +02:00
parent f2c5e44a07
commit ff163e4e39
5 changed files with 9 additions and 47 deletions

2
.gitignore vendored
View File

@ -20,3 +20,5 @@ nss-pam-ldapd-0.7.7.tar.gz.sig
/nss-pam-ldapd-0.7.12.tar.gz.sig /nss-pam-ldapd-0.7.12.tar.gz.sig
/nss-pam-ldapd-0.7.13.tar.gz /nss-pam-ldapd-0.7.13.tar.gz
/nss-pam-ldapd-0.7.13.tar.gz.sig /nss-pam-ldapd-0.7.13.tar.gz.sig
/nss-pam-ldapd-0.7.14.tar.gz
/nss-pam-ldapd-0.7.14.tar.gz.sig

View File

@ -64,15 +64,6 @@ Index: nslcd/cfg.c
=================================================================== ===================================================================
--- nslcd/cfg.c (revision 1410) --- nslcd/cfg.c (revision 1410)
+++ nslcd/cfg.c (revision 1411) +++ nslcd/cfg.c (revision 1411)
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2007 West Consulting
- Copyright (C) 2007, 2008, 2009, 2010 Arthur de Jong
+ Copyright (C) 2007, 2008, 2009, 2010, 2011 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -75,6 +75,11 @@ @@ -75,6 +75,11 @@
exit(EXIT_FAILURE); \ exit(EXIT_FAILURE); \
} }

View File

@ -1,29 +0,0 @@
Parts of r1476 -- leave enough room for GID values above a billion and
unusually large pwdLastSet values.
diff --git a/nslcd/passwd.c b/nslcd/passwd.c
index 15124fe..a649322 100644
--- a/nslcd/passwd.c
+++ b/nslcd/passwd.c
@@ -390,7 +390,7 @@ static int write_passwd(TFILE *fp,MYLDAP_ENTRY *entry,const char *requser,
const char *passwd;
uid_t uids[MAXUIDS_PER_ENTRY];
int numuids;
- char gidbuf[10];
+ char gidbuf[32];
gid_t gid;
char gecos[100];
char homedir[100];
diff --git a/nslcd/shadow.c b/nslcd/shadow.c
index 6de372b..5d6dae7 100644
--- a/nslcd/shadow.c
+++ b/nslcd/shadow.c
@@ -112,7 +112,7 @@ void shadow_init(void)
static long to_date(const char *date,const char *attr)
{
- char buffer[8];
+ char buffer[32];
long value;
char *tmp;
size_t l;

View File

@ -13,8 +13,8 @@
%endif %endif
Name: nss-pam-ldapd Name: nss-pam-ldapd
Version: 0.7.13 Version: 0.7.14
Release: 9%{?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+
@ -24,7 +24,6 @@ Source1: http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-%{version}.tar.gz.s
Source2: nslcd.init Source2: nslcd.init
Source3: nslcd.tmpfiles Source3: nslcd.tmpfiles
Source4: nslcd.service Source4: nslcd.service
Patch0: nss-pam-ldapd-0.7.x-buffers.patch
Patch1: nss-pam-ldapd-0.7.13-validname.patch Patch1: nss-pam-ldapd-0.7.13-validname.patch
Patch2: nss-pam-ldapd-0.7.x-dnssrv.patch Patch2: nss-pam-ldapd-0.7.x-dnssrv.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -59,7 +58,6 @@ nsswitch module.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .buffers
%patch1 -p0 -b .validname %patch1 -p0 -b .validname
%patch2 -p1 -b .dnssrv %patch2 -p1 -b .dnssrv
autoreconf -f -i autoreconf -f -i
@ -261,9 +259,9 @@ exit 0
%endif %endif
%changelog %changelog
* Mon Sep 12 2011 Nalin Dahyabhai <nalin@redhat.com> 0.7.13-9 * Fri Sep 23 2011 Jakub Hrozek <jhrozek@redhat.com> 0.7.14-1
- update the validnames changes to the self-tests so that their expectations - new upstream release 0.7.14
match the modified defaults (#737496) - obsoletes nss-pam-ldapd-0.7.x-buffers.patch
* Wed Aug 24 2011 Nalin Dahyabhai <nalin@redhat.com> 0.7.13-8 * Wed Aug 24 2011 Nalin Dahyabhai <nalin@redhat.com> 0.7.13-8
- include backported enhancement to take URIs in the form "dns:DOMAIN" in - include backported enhancement to take URIs in the form "dns:DOMAIN" in

View File

@ -1,2 +1,2 @@
a0493b4e57bfe3bdd74bda1e7dff0841 nss-pam-ldapd-0.7.13.tar.gz bc46b96eea32ca41d992dbff3de2400d nss-pam-ldapd-0.7.14.tar.gz
19c166a710dfa8af1a46566f4022959c nss-pam-ldapd-0.7.13.tar.gz.sig 701f2d18801405d9ae58bf51df01d458 nss-pam-ldapd-0.7.14.tar.gz.sig