[nss-pam-ldapd] Update to 0.8.12, part 1

Nalin Dahyabhai nalin at fedoraproject.org
Fri Jan 18 20:29:57 UTC 2013


commit 652cc0ff5fa6523d4688db4963a81672e7e3b450
Author: Nalin Dahyabhai <nalin at redhat.com>
Date:   Thu Jan 17 18:00:01 2013 -0500

    Update to 0.8.12, part 1
    
    Update the validnames patch, which is much simpler now.

 nss-pam-ldapd-0.7.13-validname.patch |  316 ----------------------------------
 nss-pam-ldapd-0.8.12-validname.patch |   36 ++++
 nss-pam-ldapd.spec                   |    4 +-
 3 files changed, 38 insertions(+), 318 deletions(-)
---
diff --git a/nss-pam-ldapd-0.8.12-validname.patch b/nss-pam-ldapd-0.8.12-validname.patch
new file mode 100644
index 0000000..6f5244f
--- /dev/null
+++ b/nss-pam-ldapd-0.8.12-validname.patch
@@ -0,0 +1,36 @@
+Defaults changed to allow opening and closing parentheses everywhere.  Defaults
+changed again to make characters after the first optional, and again to go back
+to disallowing names which end with "\".
+--- man/nslcd.conf.5.xml
++++ man/nslcd.conf.5.xml
+@@ -712,7 +712,7 @@
+        characters and the 'i' flag may be appended at the end to indicate
+        that the match should be case-insensetive.
+        The default value is
+-       <literal>/^[a-z0-9._@$][a-z0-9._@$ \\~-]*[a-z0-9._@$~-]$/i</literal>
++       <literal>/^[a-z0-9._@$()]([a-z0-9._@$() \\~-]*[a-z0-9._@$()~-])?$/i</literal>
+       </para>
+      </listitem>
+     </varlistentry>
+--- nslcd/cfg.c
++++ nslcd/cfg.c
+@@ -134,7 +134,7 @@ static void cfg_defaults(struct ldap_con
+     cfg->ldc_pam_authz_search[i]=NULL;
+   cfg->ldc_nss_min_uid=0;
+   parse_validnames_statement(__FILE__,__LINE__,"",
+-                "/^[a-z0-9._@$][a-z0-9._@$ \\~-]*[a-z0-9._@$~-]$/i",cfg);
++                "/^[a-z0-9._@$()]([a-z0-9._@$() \\~-]*[a-z0-9._@$()~-])?$/i",cfg);
+   cfg->pam_password_prohibit_message=NULL;
+ }
+ 
+--- tests/test_common.c
++++ tests/test_common.c
+@@ -39,6 +39,8 @@ static void test_isvalidname(void)
+   assert(!isvalidname("\\foo\\bar"));
+   assert(!isvalidname("foo\\bar\\"));
+   assert(isvalidname("me")); /* try short name */
++  assert(isvalidname("f"));
++  assert(isvalidname("(foo bar)"));
+ }
+ 
+ /* the main program... */
diff --git a/nss-pam-ldapd.spec b/nss-pam-ldapd.spec
index e4bb529..93e16e3 100644
--- a/nss-pam-ldapd.spec
+++ b/nss-pam-ldapd.spec
@@ -13,7 +13,7 @@
 %endif
 
 Name:		nss-pam-ldapd
-Version:	0.7.17
+Version:	0.8.12
 Release:	1%{?dist}
 Summary:	An nsswitch module which uses directory servers
 Group:		System Environment/Base
@@ -24,7 +24,7 @@ Source1:	http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-%{version}.tar.gz.s
 Source2:	nslcd.init
 Source3:	nslcd.tmpfiles
 Source4:	nslcd.service
-Patch1:		nss-pam-ldapd-0.7.13-validname.patch
+Patch1:		nss-pam-ldapd-0.8.12-validname.patch
 Patch2:		nss-pam-ldapd-0.7.x-dnssrv.patch
 Patch3:		nss-pam-ldapd-0.7.x-uid-overflow.patch
 Patch4:		nss-pam-ldapd-0.7.x-epipe.patch


More information about the scm-commits mailing list