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 842d2dac1d62650b431de0ec459397c855c5006c..6dd9225bac80d0347f9e9854322eb308f1fe2be6 100644 (file)
--- 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 917813614158e72ab6130cbb53b53b26d697ecdf..966124039f80d0a4861d5668c9ce6f03a1635508 100644 (file)
--- 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 fc7094bcf770a873f4d09c8839f38178dd45c874..416a599be32f2e9a9ebed6fad2ac9e3789cbb0e5 100644 (file)
--- 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}
        };