The branch, v3-2-test has been updated via 45636efa39cbcc2ecf7af4dfd1ac6a90f197ba01 (commit) via fbc510f1717fe82338262c18c252d18987c55b5c (commit) from 537b12647e25adcb7da3581f18d2e9feca1caf0c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit 45636efa39cbcc2ecf7af4dfd1ac6a90f197ba01 Merge: fbc510f1717fe82338262c18c252d18987c55b5c 537b12647e25adcb7da3581f18d2e9feca1caf0c Author: Alexander Bokovoy <[EMAIL PROTECTED]> Date: Thu Dec 13 12:57:24 2007 +0300 Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test commit fbc510f1717fe82338262c18c252d18987c55b5c Author: Alexander Bokovoy <[EMAIL PROTECTED]> Date: Thu Dec 13 12:55:32 2007 +0300 Fix pam_smbpass build ----------------------------------------------------------------------- Summary of changes: source/pam_smbpass/support.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source/pam_smbpass/support.c b/source/pam_smbpass/support.c index 9d56bd4..bc9481d 100644 --- a/source/pam_smbpass/support.c +++ b/source/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 ); -- Samba Shared Repository