From 71a035d619025910bcff350c84fd96eb2d7f2c66 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Wed, 23 Dec 2009 00:29:14 +0100
Subject: Use reload_config() in main() to load config and init logging.

Michael
---
 src/main.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main.c b/src/main.c
index ca9487b..cdc6eb0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -360,13 +360,7 @@ main (int argc, char **argv)
 
         log_message (LOG_INFO, "Initializing " PACKAGE " ...");
 
-        ret = reload_config_file(config_defaults.config_file, &config,
-                                 &config_defaults);
-        if (ret != 0) {
-                exit (EX_SOFTWARE);
-        }
-
-        ret = setup_logging ();
+        ret = reload_config ();
         if (ret != 0) {
                 exit (EX_SOFTWARE);
         }
-- 
cgit v1.2.3