diff options
| author | Günther Deschner <gd@samba.org> | 2007-05-11 11:54:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:21:57 -0500 |
| commit | 67a45aa26bd119af54b3a22425d23b064201ab6f (patch) | |
| tree | b66ff66e496fd21c6bf0a2e59cf0caab6eb36160 | |
| parent | 1cb8a948b3ce558506fe3ee084e8d0682cf4d3ed (diff) | |
| download | samba-67a45aa26bd119af54b3a22425d23b064201ab6f.tar.gz samba-67a45aa26bd119af54b3a22425d23b064201ab6f.tar.bz2 samba-67a45aa26bd119af54b3a22425d23b064201ab6f.zip | |
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)
| -rw-r--r-- | examples/pam_winbind/pam_winbind.conf | 6 | ||||
| -rw-r--r-- | source3/nsswitch/pam_winbind.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/examples/pam_winbind/pam_winbind.conf b/examples/pam_winbind/pam_winbind.conf index ca36e2ab00..8caf02d0d0 100644 --- 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 6734cba0c4..81b9c0bc6c 100644 --- 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")) |