summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-07-29 09:25:23 +0000
committerTim Potter <tpot@samba.org>2002-07-29 09:25:23 +0000
commit11785c7bc83b153e8d177928283474bbb0e5f3a9 (patch)
treeded8d50a67d0dfc41c1a1eb65bc7d1c40a0bdc41 /source3
parent6eaa06ac53840f36a9c75650f21565828e8fbbd4 (diff)
downloadsamba-11785c7bc83b153e8d177928283474bbb0e5f3a9.tar.gz
samba-11785c7bc83b153e8d177928283474bbb0e5f3a9.tar.bz2
samba-11785c7bc83b153e8d177928283474bbb0e5f3a9.zip
Use common popt definition for -d option.
(This used to be commit 8c17904848a6206ab35652625ff5f3afcf6bcb0d)
Diffstat (limited to 'source3')
-rw-r--r--source3/rpcclient/rpcclient.c8
-rw-r--r--source3/utils/net.c3
-rw-r--r--source3/utils/status.c2
3 files changed, 3 insertions, 10 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 15e7c38002..2d86fb1d3d 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -612,7 +612,6 @@ static void usage(void)
*opt_configfile=NULL,
*opt_logfile=NULL,
*opt_ipaddr=NULL;
- static int opt_debuglevel;
pstring logfile;
struct cmd_set **cmd_set;
struct in_addr server_ip;
@@ -626,14 +625,13 @@ static void usage(void)
{"authfile", 'A', POPT_ARG_STRING, &opt_authfile, 'A'},
{"conf", 's', POPT_ARG_STRING, &opt_configfile, 's'},
{"nopass", 'N', POPT_ARG_NONE, &got_pass},
- {"debug", 'd', POPT_ARG_INT, &opt_debuglevel, 'd'},
- {"debuglevel", 'd', POPT_ARG_INT, &opt_debuglevel, 'd'},
{"user", 'U', POPT_ARG_STRING, &opt_username, 'U'},
{"workgroup", 'W', POPT_ARG_STRING, &opt_domain, 'W'},
{"command", 'c', POPT_ARG_STRING, &cmdstr},
{"logfile", 'l', POPT_ARG_STRING, &opt_logfile, 'l'},
{"help", 'h', POPT_ARG_NONE, 0, 'h'},
{"dest-ip", 'I', POPT_ARG_STRING, &opt_ipaddr, 'I'},
+ { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
{ NULL }
};
@@ -673,10 +671,6 @@ static void usage(void)
pstrcpy(dyn_CONFIGFILE, opt_configfile);
break;
- case 'd':
- DEBUGLEVEL = opt_debuglevel;
- break;
-
case 'U': {
char *lp;
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 084edb6284..fc7094bcf7 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -381,8 +381,6 @@ static struct functable net_func[] = {
{"port", 'p', POPT_ARG_INT, &opt_port},
{"myname", 'n', POPT_ARG_STRING, &opt_requester_name},
{"conf", 's', POPT_ARG_STRING, &servicesf},
- {"debug", 'd', POPT_ARG_STRING, &debuglevel},
- {"debuglevel", 'd', POPT_ARG_STRING, &debuglevel},
{"server", 'S', POPT_ARG_STRING, &opt_host},
{"comment", 'C', POPT_ARG_STRING, &opt_comment},
{"maxusers", 'M', POPT_ARG_INT, &opt_maxusers},
@@ -393,6 +391,7 @@ static struct functable net_func[] = {
{"force", 'f', POPT_ARG_NONE, &opt_force},
{"timeout", 't', POPT_ARG_INT, &opt_timeout},
{"machine-pass",'P', POPT_ARG_NONE, &opt_machine_pass},
+ { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
{ 0, 0, 0, 0}
};
diff --git a/source3/utils/status.c b/source3/utils/status.c
index c624fc4c5f..0b0c591cb1 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -551,7 +551,7 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
{"brief", 'b', POPT_ARG_NONE, &brief},
{"profile", 'P', POPT_ARG_NONE, &profile_only},
{"byterange", 'B', POPT_ARG_NONE, &show_brl},
- {"debug", 'd', POPT_ARG_STRING, &new_debuglevel},
+ { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
{ 0, 0, 0, 0}
};