diff options
| author | James Peach <jpeach@samba.org> | 2007-12-13 20:56:53 -0800 |
|---|---|---|
| committer | James Peach <jpeach@samba.org> | 2007-12-13 20:56:53 -0800 |
| commit | 7b457645fb40d7195d75f8e38883b140abcb1955 (patch) | |
| tree | 90c3ca21cd40c98ed4c7c1580b75216f689fad97 /source3/pam_smbpass | |
| parent | 12ac4c3119b3b7712e670d95d61413d97ecafaef (diff) | |
| parent | 138333ed1f571cd6bb76c3be655f70e35cd48a99 (diff) | |
| download | samba-7b457645fb40d7195d75f8e38883b140abcb1955.tar.gz samba-7b457645fb40d7195d75f8e38883b140abcb1955.tar.bz2 samba-7b457645fb40d7195d75f8e38883b140abcb1955.zip | |
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 0de2b3eb515f2da21ffd1ce54979bb1f8063024b)
Diffstat (limited to 'source3/pam_smbpass')
| -rw-r--r-- | source3/pam_smbpass/support.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c index 9d56bd4950..bc9481d9e9 100644 --- a/source3/pam_smbpass/support.c +++ b/source3/pam_smbpass/support.c @@ -61,10 +61,6 @@ void _cleanup(pam_handle_t *, void *, int); char *_pam_delete(register char *); - /* default configuration file location */ - - const char *servicesf = get_dyn_CONFIGFILE(); - /* syslogging function for errors and other information */ void _log_err( int err, const char *format, ... ) @@ -128,7 +124,7 @@ int set_ctrl( int flags, int argc, const char **argv ) { int i = 0; - const char *service_file = get_dyn_CONFIGFILE(); + const char *service_file = NULL; unsigned int ctrl; ctrl = SMB_DEFAULTS; /* the default selection of options */ @@ -139,7 +135,7 @@ int set_ctrl( int flags, int argc, const char **argv ) set( SMB__NONULL, ctrl ); /* initialize service file location */ - service_file=servicesf; + service_file=get_dyn_CONFIGFILE(); if (flags & PAM_SILENT) { set( SMB__QUIET, ctrl ); |