From: Volker Lendecke <vlendec@samba.org>
Date: Wed, 21 Aug 2002 11:48:05 +0000 (+0000)
Subject: Fix debug level initialization for net.c
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=1ea5e17f950a8b7f50723649a48f67b4bca75160

Fix debug level initialization for net.c

Volker
(This used to be commit 5af5326f1311a49d3c8316e1dcc27037b831065a)
---

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 842d2dac1d6..6dd9225bac8 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -350,7 +350,7 @@ int debug_lookup_classname(const char *classname)
 
 
 /****************************************************************************
-dump the current registered denug levels
+dump the current registered debug levels
 ****************************************************************************/
 static void debug_dump_status(int level)
 {
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 91781361415..966124039f8 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3550,6 +3550,7 @@ BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
 	bGlobalOnly = global_only;
 
 	init_globals();
+	debug_init();
 
 	if (save_defaults)
 	{
diff --git a/source3/utils/net.c b/source3/utils/net.c
index fc7094bcf77..416a599be32 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -391,7 +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 },
+		{"debuglevel",  'D', POPT_ARG_STRING, &debuglevel},
 		{ 0, 0, 0, 0}
 	};