summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2002-08-21 11:48:05 +0000
committerVolker Lendecke <vlendec@samba.org>2002-08-21 11:48:05 +0000
commit1ea5e17f950a8b7f50723649a48f67b4bca75160 (patch)
tree525eb6e45c465a7367a07b086e928b6d4e16f3a9 /source3
parent07dbe5af57414d20a370920d0467d36a69b2f03a (diff)
downloadsamba-1ea5e17f950a8b7f50723649a48f67b4bca75160.tar.gz
samba-1ea5e17f950a8b7f50723649a48f67b4bca75160.tar.bz2
samba-1ea5e17f950a8b7f50723649a48f67b4bca75160.zip
Fix debug level initialization for net.c
Volker (This used to be commit 5af5326f1311a49d3c8316e1dcc27037b831065a)
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}
};