sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r15528: Make the existance of the /etc/security/pam_winbind.conf file

Browse Source 
non-critical and fallback to only parse the argv options in that case.

Guenther
This commit is contained in:
Günther Deschner 2006-05-10 21:12:10 +00:00 committed by Gerald (Jerry) Carter
parent 3546187bb4
commit 9dac3ab328
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/nsswitch/pam_winbind.c
View File

@ -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;