From: Kai Blin <kai@samba.org>
Date: Fri, 20 Jun 2008 22:07:21 +0000 (+0200)
Subject: net: Don't crash on invalid command line options.
X-Git-Tag: samba-3.3.0pre1~828
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20e0bb4800938863cb0aac1a19473748132043fc;p=thirdparty%2Fsamba.git

net: Don't crash on invalid command line options.

This backs out the workaround Jerry added in
4c3bfea9f8d238f9100eaa264b9b2941dff5a6dd.
Thanks for the catch.
---

diff --git a/source/utils/net.c b/source/utils/net.c
index c298fdb461a..d086f947f1b 100644
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -664,6 +664,7 @@ static struct functable net_func[] = {
 	/* set default debug level to 0 regardless of what smb.conf sets */
 	DEBUGLEVEL_CLASS[DBGC_ALL] = 0;
 	dbf = x_stderr;
+	c->private_data = net_func;
 
 	pc = poptGetContext(NULL, argc, (const char **) argv, long_options,
 			    POPT_CONTEXT_KEEP_FIRST);
@@ -758,7 +759,6 @@ static struct functable net_func[] = {
 		c->opt_password = getenv("PASSWD");
 	}
 
-	c->private_data = net_func;
 	rc = net_run_function(c, argc_new-1, argv_new+1, "net", net_func);
 
 	DEBUG(2,("return code = %d\n", rc));
diff --git a/source/utils/net_util.c b/source/utils/net_util.c
index 8938b9cf014..ae1d4ea2b69 100644
--- a/source/utils/net_util.c
+++ b/source/utils/net_util.c
@@ -551,13 +551,6 @@ int net_run_function(struct net_context *c, int argc, const char **argv,
 {
 	int i;
 
-	if (!table) {
-		d_fprintf(stderr, "Invalid command. Run \"%s\" for more details.\n",
-			  whoami);
-		return 1;
-	}
-
-
 	if (argc != 0) {
 		for (i=0; table[i].funcname != NULL; i++) {
 			if (StrCaseCmp(argv[0], table[i].funcname) == 0)