summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2008-06-21 00:07:21 +0200
committerKai Blin <kai@samba.org>2008-06-21 00:07:21 +0200
commitaccc68f63e91e8684d7186fa718bd51e2e4e8922 (patch)
tree054c3ae1650b51a93032bdf14bd9d1a1381d1973
parentc4d6ca41d919cfec11b0f05e8b2f3bffbfadefcc (diff)
downloadsamba-accc68f63e91e8684d7186fa718bd51e2e4e8922.tar.gz
samba-accc68f63e91e8684d7186fa718bd51e2e4e8922.tar.bz2
samba-accc68f63e91e8684d7186fa718bd51e2e4e8922.zip
net: Don't crash on invalid command line options.
This backs out the workaround Jerry added in 4c3bfea9f8d238f9100eaa264b9b2941dff5a6dd. Thanks for the catch. (This used to be commit 20e0bb4800938863cb0aac1a19473748132043fc)
-rw-r--r--source3/utils/net.c2
-rw-r--r--source3/utils/net_util.c7
2 files changed, 1 insertions, 8 deletions
diff --git a/source3/utils/net.c b/source3/utils/net.c
index c298fdb461..d086f947f1 100644
--- a/source3/utils/net.c
+++ b/source3/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/source3/utils/net_util.c b/source3/utils/net_util.c
index 8938b9cf01..ae1d4ea2b6 100644
--- a/source3/utils/net_util.c
+++ b/source3/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)