sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-22 16:23:49 +03:00
Code Activity

r26275: return loadparm context in lp_load.

Browse Source
This commit is contained in:
Jelmer Vernooij
2007-12-04 00:12:13 +01:00
committed by Stefan Metzmacher
parent 3809113d86
commit d01f0f4c20
11 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/lib/cmdline/popt_common.c
View File

@@ -52,9 +52,9 @@ static void popt_common_callback(poptContext con,
if (reason == POPT_CALLBACK_REASON_POST) {
if (!lp_loaded()) {
if (getenv("SMB_CONF_PATH"))
lp_load(getenv("SMB_CONF_PATH"));
lp_load(getenv("SMB_CONF_PATH"), NULL);
else
lp_load(dyn_CONFIGFILE);
lp_load(dyn_CONFIGFILE, NULL);
}
/* Hook any 'every Samba program must do this, after
* the smb.conf is setup' functions here */
@@ -101,7 +101,7 @@ static void popt_common_callback(poptContext con,
case 's':
if (arg) {
lp_load(arg);
lp_load(arg, NULL);
}
break;