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

[vorlon at alioth.debian.org]

tags 566890 pending
tags 282751 pending
thanks

Author: vorlon
Date: 2010-02-27 22:48:18 +0000 (Sat, 27 Feb 2010)
New Revision: 3334

Added:
   trunk/samba/debian/winbind.pam-config
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/rules
   trunk/samba/debian/winbind.files
Log:
Add a PAM profile for pam_winbind.  Closes: #566890, LP: #282751.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2010-02-27 06:17:37 UTC (rev 3333)
+++ trunk/samba/debian/changelog	2010-02-27 22:48:18 UTC (rev 3334)
@@ -1,3 +1,9 @@
+samba (2:3.4.6~dfsg-2) UNRELEASED; urgency=low
+
+  * Add a PAM profile for pam_winbind.  Closes: #566890, LP: #282751.
+
+ -- Steve Langasek <vorlon at debian.org>  Sat, 27 Feb 2010 14:35:48 -0800
+
 samba (2:3.4.6~dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2010-02-27 06:17:37 UTC (rev 3333)
+++ trunk/samba/debian/rules	2010-02-27 22:48:18 UTC (rev 3334)
@@ -174,6 +174,7 @@
 	install -m 0755 source3/bin/smbconftort $(DESTDIR)/usr/bin/smbconftort
 	mkdir -p $(DESTDIR)/usr/share/pam-configs
 	install -m 0644 debian/libpam-smbpass.pam-config $(DESTDIR)/usr/share/pam-configs/smbpasswd-migrate
+	install -m 0644 debian/winbind.pam-config $(DESTDIR)/usr/share/pam-configs/winbind
 
 ifeq ($(mount_cifs),yes)
 	install -m 0755 debian/mount.smbfs $(DESTDIR)/sbin/mount.smbfs

Modified: trunk/samba/debian/winbind.files
===================================================================
--- trunk/samba/debian/winbind.files	2010-02-27 06:17:37 UTC (rev 3333)
+++ trunk/samba/debian/winbind.files	2010-02-27 22:48:18 UTC (rev 3334)
@@ -20,5 +20,6 @@
 usr/share/man/man8/idmap_adex.8
 usr/share/man/man8/idmap_hash.8
 lib/security/pam_winbind.so
+usr/share/pam-configs/winbind
 lib/libnss_winbind.so.2
 lib/libnss_wins.so.2

Added: trunk/samba/debian/winbind.pam-config
===================================================================
--- trunk/samba/debian/winbind.pam-config	                        (rev 0)
+++ trunk/samba/debian/winbind.pam-config	2010-02-27 22:48:18 UTC (rev 3334)
@@ -0,0 +1,19 @@
+Name: Winbind NT/Active Directory authentication
+Default: yes
+Priority: 192
+Auth-Type: Primary
+Auth:
+	[success=end default=ignore]	pam_winbind.so krb5_auth krb5_ccache_type=FILE cached_login try_first_pass
+Auth-Initial:
+	[success=end default=ignore]	pam_winbind.so krb5_auth krb5_ccache_type=FILE cached_login
+Account-Type: Primary
+Account:
+	[success=end new_authtok_reqd=done default=ignore]	pam_winbind.so
+Password-Type: Additional
+Password:
+	requisite			pam_winbind.so use_authtok try_first_pass
+Password-Initial:
+	requisite			pam_winbind.so
+Session-Type: Additional
+Session:
+	optional			pam_winbind.so