Perform lp_load() before popt to fix -W option.
authorTim Potter <tpot@samba.org>
Mon, 28 Apr 2003 07:03:08 +0000 (07:03 +0000)
committerTim Potter <tpot@samba.org>
Mon, 28 Apr 2003 07:03:08 +0000 (07:03 +0000)
(This used to be commit d20f4bf5d84f435a7b4b692bf33f05f4ec871a50)

source3/rpcclient/rpcclient.c

index 0411212e8c8a7ebdad2d6bf4cb6fb477277b675d..b01e2d694c55b8573bc89d68018ef61f3d17f2b9 100644 (file)
@@ -537,6 +537,17 @@ out_free:
 
        setlinebuf(stdout);
 
+       /* the following functions are part of the Samba debugging
+          facilities.  See lib/debug.c */
+       setup_logging("rpcclient", interactive);
+       if (!interactive) 
+               reopen_logs();
+       
+       /* Load smb.conf file */
+
+       if (!lp_load(dyn_CONFIGFILE,True,False,False))
+               fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
+
        /* Parse options */
 
        pc = poptGetContext("rpcclient", argc, (const char **) argv,
@@ -571,17 +582,6 @@ out_free:
 
        poptFreeContext(pc);
 
-       /* the following functions are part of the Samba debugging
-          facilities.  See lib/debug.c */
-       setup_logging("rpcclient", interactive);
-       if (!interactive) 
-               reopen_logs();
-       
-       /* Load smb.conf file */
-
-       if (!lp_load(dyn_CONFIGFILE,True,False,False))
-               fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
-
        load_interfaces();
 
        if (!init_names())