[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  49b500a smbcacls: parse config file argument prior to load
      from  f0adcf3 net/doc: make clear that net vampire is for NT4 domains only

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 49b500a61f0e1ed9d02654597c0785e7a1b933e9
Author: David Disseldorp <ddiss at samba.org>
Date:   Mon Jul 7 15:24:19 2014 +0200

    smbcacls: parse config file argument prior to load
    
    Fixes usage with the common "-s|--configfile" parameter.
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon Jul  7 23:30:50 CEST 2014 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/smbcacls.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 47d75fe..c771225 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;


-- 
Samba Shared Repository