svn commit: samba r22794 - in branches: SAMBA_3_0/examples/pam_winbind SAMBA_3_0/source/nsswitch SAMBA_3_0_26/examples/pam_winbind SAMBA_3_0_26/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2007-05-11 11:54:41 +0000 (Fri, 11 May 2007)
New Revision: 22794

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22794

Log:
Add "debug_state" and "silent" to pam_winbind.conf template. Honor the silent
argument when parsing pam configuration file options.

Guenther

Modified:
   branches/SAMBA_3_0/examples/pam_winbind/pam_winbind.conf
   branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
   branches/SAMBA_3_0_26/examples/pam_winbind/pam_winbind.conf
   branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c


Changeset:
Modified: branches/SAMBA_3_0/examples/pam_winbind/pam_winbind.conf
===================================================================
--- branches/SAMBA_3_0/examples/pam_winbind/pam_winbind.conf	2007-05-11 10:15:20 UTC (rev 22793)
+++ branches/SAMBA_3_0/examples/pam_winbind/pam_winbind.conf	2007-05-11 11:54:41 UTC (rev 22794)
@@ -9,6 +9,9 @@
 # turn on debugging
 ;debug = no
 
+# turn on extended PAM state debugging
+;debug_state = no
+
 # request a cached login if possible
 # (needs "winbind offline logon = yes" in smb.conf)
 ;cached_login = no
@@ -24,3 +27,6 @@
 # make successful authentication dependend on membership of one SID
 # (can also take a name)
 ;require_membership_of =
+
+# omit pam conversations
+;silent = no

Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2007-05-11 10:15:20 UTC (rev 22793)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2007-05-11 11:54:41 UTC (rev 22794)
@@ -273,6 +273,8 @@
 			ctrl |= WINBIND_DEBUG_ARG;
 		else if (!strcasecmp(*v, "debug_state"))
 			ctrl |= WINBIND_DEBUG_STATE;
+		else if (!strcasecmp(*v, "silent"))
+			ctrl |= WINBIND_SILENT;
 		else if (!strcasecmp(*v, "use_authtok"))
 			ctrl |= WINBIND_USE_AUTHTOK_ARG;
 		else if (!strcasecmp(*v, "use_first_pass"))

Modified: branches/SAMBA_3_0_26/examples/pam_winbind/pam_winbind.conf
===================================================================
--- branches/SAMBA_3_0_26/examples/pam_winbind/pam_winbind.conf	2007-05-11 10:15:20 UTC (rev 22793)
+++ branches/SAMBA_3_0_26/examples/pam_winbind/pam_winbind.conf	2007-05-11 11:54:41 UTC (rev 22794)
@@ -9,6 +9,9 @@
 # turn on debugging
 ;debug = no
 
+# turn on extended PAM state debugging
+;debug_state = no
+
 # request a cached login if possible
 # (needs "winbind offline logon = yes" in smb.conf)
 ;cached_login = no
@@ -24,3 +27,6 @@
 # make successful authentication dependend on membership of one SID
 # (can also take a name)
 ;require_membership_of =
+
+# omit pam conversations
+;silent = no

Modified: branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c
===================================================================
--- branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c	2007-05-11 10:15:20 UTC (rev 22793)
+++ branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c	2007-05-11 11:54:41 UTC (rev 22794)
@@ -273,6 +273,8 @@
 			ctrl |= WINBIND_DEBUG_ARG;
 		else if (!strcasecmp(*v, "debug_state"))
 			ctrl |= WINBIND_DEBUG_STATE;
+		else if (!strcasecmp(*v, "silent"))
+			ctrl |= WINBIND_SILENT;
 		else if (!strcasecmp(*v, "use_authtok"))
 			ctrl |= WINBIND_USE_AUTHTOK_ARG;
 		else if (!strcasecmp(*v, "use_first_pass"))