diff options
| author | David Disseldorp <ddiss@samba.org> | 2014-07-07 15:24:19 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-07-07 23:30:50 +0200 |
| commit | 49b500a61f0e1ed9d02654597c0785e7a1b933e9 (patch) | |
| tree | ffee6366317aa0cc036f8e3ddb6e8f9925773db4 /source3/utils/smbcacls.c | |
| parent | f0adcf33b83f6fe5098a618e4da46cfb185b2166 (diff) | |
| download | samba-49b500a61f0e1ed9d02654597c0785e7a1b933e9.tar.gz | |
smbcacls: parse config file argument prior to load
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
Diffstat (limited to 'source3/utils/smbcacls.c')
| -rw-r--r-- | source3/utils/smbcacls.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 47d75fe3449..c77122569c0 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -1408,8 +1408,6 @@ int main(int argc, char *argv[]) setlinebuf(stdout); - lp_load_global(get_dyn_CONFIGFILE()); - load_interfaces(); auth_info = user_auth_info_init(frame); if (auth_info == NULL) { @@ -1480,6 +1478,9 @@ int main(int argc, char *argv[]) return -1; } + lp_load_global(get_dyn_CONFIGFILE()); + load_interfaces(); + filename = talloc_strdup(frame, poptGetArg(pc)); if (!filename) { return -1; |