summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-05-10 21:12:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:16:56 -0500
commitf65ff9d637d6d7c6fa005d77d1ea2844c0c87ce4 (patch)
treedbf456f949d348846c0fd53093676be469180d24 /source3
parent7029a2ee7005c3e190e4acf35d2b4c75f4d44884 (diff)
downloadsamba-f65ff9d637d6d7c6fa005d77d1ea2844c0c87ce4.tar.gz
samba-f65ff9d637d6d7c6fa005d77d1ea2844c0c87ce4.tar.bz2
samba-f65ff9d637d6d7c6fa005d77d1ea2844c0c87ce4.zip
r15528: Make the existance of the /etc/security/pam_winbind.conf file
non-critical and fallback to only parse the argv options in that case. Guenther (This used to be commit 9dac3ab328e9c7ba374e0efc3fe16d940ecc9d3b)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/pam_winbind.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index 239db5da5b..e57114ec28 100644
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -66,7 +66,7 @@ static int _pam_parse(int argc, const char **argv, dictionary **d)
*d = iniparser_load(CONST_DISCARD(char *, config_file));
if (*d == NULL) {
- return -1;
+ goto config_from_pam;
}
if (iniparser_getboolean(*d, CONST_DISCARD(char *, "global:debug"), False)) {
@@ -807,7 +807,7 @@ const char *get_conf_item_string(int argc,
goto out;
}
- /* let the pam opt take precedence over the smb.conf option */
+ /* let the pam opt take precedence over the pam_winbind.conf option */
if (d != NULL) {
@@ -836,7 +836,9 @@ const char *get_conf_item_string(int argc,
}
}
- _pam_log_debug(ctrl, LOG_INFO, "CONFIG file: %s '%s'\n", item, parm_opt);
+ if (d != NULL) {
+ _pam_log_debug(ctrl, LOG_INFO, "CONFIG file: %s '%s'\n", item, parm_opt);
+ }
out:
SAFE_FREE(parm);
return parm_opt;