svn commit: samba r13379 - branches/SAMBA_3_0/source/rpcclient trunk/source/rpcclient

[vlendec at samba.org]

Author: vlendec
Date: 2006-02-07 23:30:31 +0000 (Tue, 07 Feb 2006)
New Revision: 13379

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13379

Log:
Andrew correctly noted that this breaks -s. Not sure what to do...
Modified:
   branches/SAMBA_3_0/source/rpcclient/rpcclient.c
   trunk/source/rpcclient/rpcclient.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpcclient/rpcclient.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/rpcclient.c	2006-02-07 22:38:29 UTC (rev 13378)
+++ branches/SAMBA_3_0/source/rpcclient/rpcclient.c	2006-02-07 23:30:31 UTC (rev 13379)
@@ -716,16 +716,6 @@
 	if (!interactive) 
 		reopen_logs();
 	
-	load_interfaces();
-
-	if (!init_names())
-		return 1;
-
-	/* Load smb.conf file */
-
-	if (!lp_load(dyn_CONFIGFILE,True,False,False,True))
-		fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
-
 	/* Parse options */
 
 	pc = poptGetContext("rpcclient", argc, (const char **) argv,
@@ -760,6 +750,16 @@
 
 	poptFreeContext(pc);
 
+	load_interfaces();
+
+	if (!init_names())
+		return 1;
+
+	/* Load smb.conf file */
+
+	if (!lp_load(dyn_CONFIGFILE,True,False,False,True))
+		fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
+
 	/*
 	 * Get password
 	 * from stdin if necessary

Modified: trunk/source/rpcclient/rpcclient.c
===================================================================
--- trunk/source/rpcclient/rpcclient.c	2006-02-07 22:38:29 UTC (rev 13378)
+++ trunk/source/rpcclient/rpcclient.c	2006-02-07 23:30:31 UTC (rev 13379)
@@ -718,16 +718,6 @@
 	if (!interactive) 
 		reopen_logs();
 	
-	load_interfaces();
-
-	if (!init_names())
-		return 1;
-
-	/* Load smb.conf file */
-
-	if (!lp_load(dyn_CONFIGFILE,True,False,False,True))
-		fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
-
 	/* Parse options */
 
 	pc = poptGetContext("rpcclient", argc, (const char **) argv,
@@ -762,6 +752,16 @@
 
 	poptFreeContext(pc);
 
+	load_interfaces();
+
+	if (!init_names())
+		return 1;
+
+	/* Load smb.conf file */
+
+	if (!lp_load(dyn_CONFIGFILE,True,False,False,True))
+		fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
+
 	/*
 	 * Get password
 	 * from stdin if necessary