summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/debug.c2
-rw-r--r--source3/param/loadparm.c1
-rw-r--r--source3/utils/net.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 842d2dac1d..6dd9225bac 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 9178136141..966124039f 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 fc7094bcf7..416a599be3 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}
};