sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

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

Browse Source 
This backs out the workaround Jerry added in
4c3bfea9f8d238f9100eaa264b9b2941dff5a6dd.
Thanks for the catch.
(This used to be commit 20e0bb4800938863cb0aac1a19473748132043fc)
This commit is contained in:
Kai Blin 2008-06-21 00:07:21 +02:00
parent c4d6ca41d9
commit accc68f63e
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/utils/net.c
View File

@ -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));

7
source3/utils/net_util.c
View File

@ -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)