r22794: Add "debug_state" and "silent" to pam_winbind.conf template. Honor the silent

argument when parsing pam configuration file options.

Guenther
(This used to be commit 5b4a4df26f32fe1947a0c4fb741a4cb89e308f92)

diff --git a/examples/pam_winbind/pam_winbind.conf b/examples/pam_winbind/pam_winbind.conf
index ca36e2ab00a3c2c24d1508aaa7abcc26ab048f58..8caf02d0d087357f31ca1707154ba53deb362d35 100644 (file)
--- a/examples/pam_winbind/pam_winbind.conf
+++ b/examples/pam_winbind/pam_winbind.conf
@@ -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

diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index 6734cba0c4c6875a375c07f509f0129e26c02399..81b9c0bc6cbb4c148db0ba4dedee04527838e3a2 100644 (file)
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -273,6 +273,8 @@ config_from_pam:
                        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"))