[Pkg-samba-maint] r3417 - trunk/samba/debian

[vorlon at alioth.debian.org]

tags 573323 pending
tags 546874 pending
thanks

Author: vorlon
Date: 2010-04-06 23:53:04 +0000 (Tue, 06 Apr 2010)
New Revision: 3417

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/winbind.pam-config
   trunk/samba/debian/winbind.postinst
Log:
Fix winbind.pam-config to not interfere with password changes for
non-winbind accounts.  Closes: #573323, LP: #546874.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2010-04-06 18:12:47 UTC (rev 3416)
+++ trunk/samba/debian/changelog	2010-04-06 23:53:04 UTC (rev 3417)
@@ -10,6 +10,8 @@
   [ Steve Langasek ]
   * winbind.prerm: don't forget to remove the PAM profile on package
     removal :/
+  * Fix winbind.pam-config to not interfere with password changes for
+    non-winbind accounts.  Closes: #573323, LP: #546874.
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 24 Mar 2010 22:02:25 +0100
 

Modified: trunk/samba/debian/winbind.pam-config
===================================================================
--- trunk/samba/debian/winbind.pam-config	2010-04-06 18:12:47 UTC (rev 3416)
+++ trunk/samba/debian/winbind.pam-config	2010-04-06 23:53:04 UTC (rev 3417)
@@ -9,11 +9,11 @@
 Account-Type: Primary
 Account:
 	[success=end new_authtok_reqd=done default=ignore]	pam_winbind.so
-Password-Type: Additional
+Password-Type: Primary
 Password:
-	requisite			pam_winbind.so use_authtok try_first_pass
+	[success=end default=ignore]	pam_winbind.so use_authtok try_first_pass
 Password-Initial:
-	requisite			pam_winbind.so
+	[success=end default=ignore]	pam_winbind.so
 Session-Type: Additional
 Session:
 	optional			pam_winbind.so

Modified: trunk/samba/debian/winbind.postinst
===================================================================
--- trunk/samba/debian/winbind.postinst	2010-04-06 18:12:47 UTC (rev 3416)
+++ trunk/samba/debian/winbind.postinst	2010-04-06 23:53:04 UTC (rev 3417)
@@ -13,4 +13,6 @@
         mv /var/run/samba/idmap_cache.tdb /var/cache/samba/idmap_cache.tdb
 fi
 
+pam-auth-update --package
+
 #DEBHELPER#