rpms/samba/F-11 samba-3.3.5-pam_winbind.diff, NONE, 1.1 samba.spec, 1.185, 1.186

[Guenther Deschner]

Author: gd

Update of /cvs/pkgs/rpms/samba/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30362

Modified Files:
	samba.spec 
Added Files:
	samba-3.3.5-pam_winbind.diff 
Log Message:
Fix password expiry calculation in pam_winbind

Guenther


samba-3.3.5-pam_winbind.diff:

--- NEW FILE samba-3.3.5-pam_winbind.diff ---
commit 3815e87f1ffea44c4d76e6c2515ff4894f6896c9
Author:     Günther Deschner <gd at samba.org>
AuthorDate: Tue May 5 12:54:21 2009 +0200
Commit:     Karolin Seeger <kseeger at samba.org>
CommitDate: Fri Jun 19 08:17:54 2009 +0200

    s3-pam_winbind: Fix Bug 6253: Use correct value for password expiry calculation.
    
    Based on patch from Blindauer Emmanuel <samba at mooby.net>.
    
    Guenther
---
 source/nsswitch/pam_winbind.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c
index 26ef1d4..1211ffd 100644
--- a/source/nsswitch/pam_winbind.c
+++ b/source/nsswitch/pam_winbind.c
@@ -914,7 +914,8 @@ static void _pam_warn_password_expiry(struct pwb_context *ctx,
 	/* now check for the global password policy */
 	/* good catch from Ralf Haferkamp: an expiry of "never" is translated
 	 * to -1 */
-	if (policy->expire <= 0) {
+	if ((policy->expire == (int64_t)-1) ||
+	    (policy->expire == 0)) {
 		return;
 	}
 


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-11/samba.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- samba.spec	16 Jun 2009 12:38:31 -0000	1.185
+++ samba.spec	19 Jun 2009 10:55:56 -0000	1.186
@@ -1,4 +1,4 @@
-%define main_release 37
+%define main_release 38
 %define samba_version 3.3.5
 %define tdb_version 1.1.2
 %define talloc_version 1.2.0
@@ -46,6 +46,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosnam
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
+Patch201: samba-3.3.5-pam_winbind.diff
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -250,6 +251,7 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
+%patch201 -p1 -b .pam_winbind
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < source/VERSION.orig > source/VERSION
@@ -879,6 +881,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Fri Jun 19 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.5-0.38
+- Fix password expiry calculation in pam_winbind
+
 * Tue Jun 16 2009 Guenther Deschner <gdeschner at redhat.com> - 3.3.5-0.37
 - Update to 3.3.5