sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-31 17:18:04 +03:00
Code

Use popt_common for -s, -d and -V

Browse Source 
(This used to be commit a1576694a6)
This commit is contained in:
Jelmer Vernooij 2003-03-23 12:40:48 +00:00
parent 477e1a8cee
commit be47eb5032
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/utils/net.c
View File

@ -78,8 +78,6 @@ static int opt_machine_pass = 0;
BOOL opt_have_ip = False; BOOL opt_have_ip = False;
struct in_addr opt_dest_ip; struct in_addr opt_dest_ip;
extern BOOL AllowDebugChange;
/* /*
run a function from a function table. If not found then run a function from a function table. If not found then
call the specified usage function call the specified usage function
@ -513,8 +511,6 @@ static struct functable net_func[] = {
int argc_new = 0; int argc_new = 0;
const char ** argv_new; const char ** argv_new;
poptContext pc; poptContext pc;
static char *servicesf = dyn_CONFIGFILE;
static char *debuglevel = NULL;
struct poptOption long_options[] = { struct poptOption long_options[] = {
{"help", 'h', POPT_ARG_NONE, 0, 'h'}, {"help", 'h', POPT_ARG_NONE, 0, 'h'},
@ -524,7 +520,6 @@ static struct functable net_func[] = {
{"ipaddress", 'I', POPT_ARG_STRING, 0,'I'}, {"ipaddress", 'I', POPT_ARG_STRING, 0,'I'},
{"port", 'p', POPT_ARG_INT, &opt_port}, {"port", 'p', POPT_ARG_INT, &opt_port},
{"myname", 'n', POPT_ARG_STRING, &opt_requester_name}, {"myname", 'n', POPT_ARG_STRING, &opt_requester_name},
{"conf", 's', POPT_ARG_STRING, &servicesf},
{"server", 'S', POPT_ARG_STRING, &opt_host}, {"server", 'S', POPT_ARG_STRING, &opt_host},
{"container", 'c', POPT_ARG_STRING, &opt_container}, {"container", 'c', POPT_ARG_STRING, &opt_container},
{"comment", 'C', POPT_ARG_STRING, &opt_comment}, {"comment", 'C', POPT_ARG_STRING, &opt_comment},
@ -536,8 +531,9 @@ static struct functable net_func[] = {
{"force", 'f', POPT_ARG_NONE, &opt_force}, {"force", 'f', POPT_ARG_NONE, &opt_force},
{"timeout", 't', POPT_ARG_INT, &opt_timeout}, {"timeout", 't', POPT_ARG_INT, &opt_timeout},
{"machine-pass",'P', POPT_ARG_NONE, &opt_machine_pass}, {"machine-pass",'P', POPT_ARG_NONE, &opt_machine_pass},
{"debuglevel", 'd', POPT_ARG_STRING, &debuglevel}, POPT_COMMON_SAMBA
{NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version}, { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile },
{ 0, 0, 0, 0} { 0, 0, 0, 0}
}; };
@ -577,13 +573,8 @@ static struct functable net_func[] = {
exit(1); exit(1);
} }
} }
if (debuglevel) { lp_load(dyn_CONFIGFILE,True,False,False);
debug_parse_levels(debuglevel);
AllowDebugChange = False;
}
lp_load(servicesf,True,False,False);
argv_new = (const char **)poptGetArgs(pc); argv_new = (const char **)poptGetArgs(pc);

5
source3/utils/net_help.c
View File

@ -42,11 +42,12 @@ int net_common_flags_usage(int argc, const char **argv)
d_printf("Valid miscellaneous options are:\n"); /* misc options */ d_printf("Valid miscellaneous options are:\n"); /* misc options */
d_printf("\t-p or --port=<port>\t\tconnection port on target\n"); d_printf("\t-p or --port=<port>\t\tconnection port on target\n");
d_printf("\t-W or --myworkgroup=<wg>\tclient workgroup\n"); d_printf("\t-W or --myworkgroup=<wg>\tclient workgroup\n");
d_printf("\t-d or --debug=<level>\t\tdebug level (0-10)\n"); d_printf("\t-d or --debuglevel=<level>\t\tdebug level (0-10)\n");
d_printf("\t-n or --myname=<name>\t\tclient name\n"); d_printf("\t-n or --myname=<name>\t\tclient name\n");
d_printf("\t-U or --user=<name>\t\tuser name\n"); d_printf("\t-U or --user=<name>\t\tuser name\n");
d_printf("\t-s or --conf=<path>\t\tpathname of smb.conf file\n"); d_printf("\t-s or --configfile=<path>\t\tpathname of smb.conf file\n");
d_printf("\t-l or --long\t\t\tDisplay full information\n"); d_printf("\t-l or --long\t\t\tDisplay full information\n");
d_printf("\t-V or --version\t\tPrint samba version information\n");
d_printf("\t-P or --machine-pass\t\tAuthenticate as machine account\n"); d_printf("\t-P or --machine-pass\t\tAuthenticate as machine account\n");
return -1; return -1;
} }