3 files changed, 2 insertions, 16 deletions
diff --git a/lib/util/debug.c b/lib/util/debug.c
index c8a22149a2..055dfbb12e 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -37,7 +37,6 @@ static int debug_all_class_hack = 1;
 int *DEBUGLEVEL_CLASS = &debug_all_class_hack; /* For samba 3 */
 static bool debug_all_class_isset_hack = true;
 bool    *DEBUGLEVEL_CLASS_ISSET = &debug_all_class_isset_hack; /* For samba 3 */
-XFILE *dbf = NULL; /* For Samba 3*/
 
 /* the registered mutex handlers */
 static struct {
@@ -210,14 +209,6 @@ _PUBLIC_ void setup_logging(const char *prog_name, enum debug_logtype new_logtyp
 }
 
 /**
-   Just run logging to stdout for this program 
-*/
-_PUBLIC_ void setup_logging_stdout(void)
-{
-	setup_logging(NULL, DEBUG_STDOUT);
-}
-
-/**
   return a string constant containing n tabs
   no more than 10 tabs are returned
 */
diff --git a/lib/util/debug.h b/lib/util/debug.h
index 0172df8efe..a62db1a387 100644
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -79,7 +79,7 @@ extern int DEBUGLEVEL;
  * for example.  This makes it easy to override for debug to stderr on
  * the command line, as the smb.conf cannot reset it back to
  * file-based logging */
-enum debug_logtype {DEBUG_STDOUT = 0, DEBUG_FILE = 1, DEBUG_STDERR = 2};
+enum debug_logtype {DEBUG_DEFAULT_STDERR = 0, DEBUG_STDOUT = 1, DEBUG_FILE = 2, DEBUG_STDERR = 3};
 
 /**
   the backend for debug messages. Note that the DEBUG() macro has already
@@ -106,11 +106,6 @@ _PUBLIC_ void debug_schedule_reopen_logs(void);
 _PUBLIC_ void setup_logging(const char *prog_name, enum debug_logtype new_logtype);
 
 /**
-   Just run logging to stdout for this program 
-*/
-_PUBLIC_ void setup_logging_stdout(void);
-
-/**
   return a string constant containing n tabs
   no more than 10 tabs are returned
 */
diff --git a/librpc/tools/ndrdump.c b/librpc/tools/ndrdump.c
index b9b4bc7fd6..f0f4eaff4e 100644
--- a/librpc/tools/ndrdump.c
+++ b/librpc/tools/ndrdump.c
@@ -180,7 +180,7 @@ static void ndrdump_data(uint8_t *d, uint32_t l, bool force)
 
 	setlinebuf(stdout);
 
-	setup_logging_stdout();
+	setup_logging("ndrdump", DEBUG_STDOUT);
 
 	pc = poptGetContext("ndrdump", argc, argv, long_options, 0);