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

smbcacls: parse config file argument prior to load

Browse Source 
Fixes usage with the common "-s|--configfile" parameter.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Mon Jul  7 23:30:50 CEST 2014 on sn-devel-104
This commit is contained in:
David Disseldorp
2014-07-07 15:24:19 +02:00
committed by Jeremy Allison
parent f0adcf33b8
commit 49b500a61f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source3/utils/smbcacls.c
View File

@@ -1408,8 +1408,6 @@ int main(int argc, char *argv[])
setlinebuf(stdout); setlinebuf(stdout);
lp_load_global(get_dyn_CONFIGFILE());
load_interfaces();
auth_info = user_auth_info_init(frame); auth_info = user_auth_info_init(frame);
if (auth_info == NULL) { if (auth_info == NULL) {
@@ -1480,6 +1478,9 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
lp_load_global(get_dyn_CONFIGFILE());
load_interfaces();
filename = talloc_strdup(frame, poptGetArg(pc)); filename = talloc_strdup(frame, poptGetArg(pc));
if (!filename) { if (!filename) {
return -1; return -1;