sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-21 12:59:09 +03:00
Code Activity

r21962: Make pdbedit use the configfile specified by -s

Browse Source 
(This used to be commit f540c18b2b)
This commit is contained in:
Volker Lendecke
2007-03-24 21:29:53 +00:00
committed by Gerald (Jerry) Carter
parent 9527f93272
commit fe962d2e48
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source3/utils/pdbedit.c
View File

@ -761,6 +761,7 @@ int main (int argc, char **argv)
static char *pwd_time_format = NULL;
static BOOL pw_from_stdin = False;
struct pdb_methods *bin, *bout, *bdef;
char *configfile = NULL;
poptContext pc;
struct poptOption long_options[] = {
POPT_AUTOHELP
@ -818,6 +819,9 @@ int main (int argc, char **argv)
case 'C':
account_policy_value_set = True;
break;
case 's':
configfile = optarg;
break;
}
}
@ -826,7 +830,8 @@ int main (int argc, char **argv)
if (user_name == NULL)
user_name = poptGetArg(pc);
if (!lp_load(dyn_CONFIGFILE,True,False,False,True)) {
if (!lp_load(configfile?configfile:dyn_CONFIGFILE,
True,False,False,True)) {
fprintf(stderr, "Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE);
exit(1);
}