From 11785c7bc83b153e8d177928283474bbb0e5f3a9 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 29 Jul 2002 09:25:23 +0000
Subject: Use common popt definition for -d option. (This used to be commit
 8c17904848a6206ab35652625ff5f3afcf6bcb0d)

---
 source3/utils/net.c    | 3 +--
 source3/utils/status.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'source3/utils')

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}
 	};
 
-- 
cgit