rpms/nss_ldap/devel nss_ldap-259-parse2.patch,1.1,1.2

Nalin Somabhai Dahyabhai (nalin) fedora-extras-commits at redhat.com
Tue Feb 26 22:27:39 UTC 2008


Author: nalin

Update of /cvs/pkgs/rpms/nss_ldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19906

Modified Files:
	nss_ldap-259-parse2.patch 
Log Message:
- avoid regressing pw->pw_expire being counted in seconds and not days


nss_ldap-259-parse2.patch:

Index: nss_ldap-259-parse2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap-259-parse2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nss_ldap-259-parse2.patch	26 Feb 2008 20:52:05 -0000	1.1
+++ nss_ldap-259-parse2.patch	26 Feb 2008 22:27:29 -0000	1.2
@@ -327,7 +327,7 @@
  
    stat =
      _nss_ldap_assign_attrval (e, AT (gecos), &pw->pw_gecos, &buffer,
-@@ -176,26 +193,42 @@ _nss_ldap_parse_pw (LDAPMessage * e,
+@@ -176,26 +193,45 @@ _nss_ldap_parse_pw (LDAPMessage * e,
   tmp = NULL;
    stat =
      _nss_ldap_assign_attrval (e, AT (shadowMax), &tmp, &buffer, &buflen);
@@ -367,7 +367,10 @@
      _nss_ldap_assign_attrval (e, AT (shadowExpire), &tmp, &buffer, &buflen);
 -  pw->pw_expire = (stat == NSS_SUCCESS) ? atol(tmp) * (24*60*60) : 0;
 +  if (stat == NSS_SUCCESS)
-+    _nss_ldap_parse_long (tmp, 0, &pw->pw_expire);
++    {
++      _nss_ldap_parse_long (tmp, 0, &pw->pw_expire);
++      pw->pw_expire *= (24*60*60);
++    }
 +  else
 +    pw->pw_expire = 0;
  #endif /* HAVE_PASSWD_PW_EXPIRE */




More information about the fedora-extras-commits mailing list