Changeset 537d9b9 for unix.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master up to commit '9f03c47' into parson

File:

• unix.c (modified) (2 diffs)

unix.c

@@ -80 +80 @@
         }
 
+        if (global.conf->runmode == RUNMODE_INETD) {
+                log_link(LOGLVL_ERROR, LOGOUTPUT_IRC);
+                log_link(LOGLVL_WARNING, LOGOUTPUT_IRC);
+        } else {
+                log_link(LOGLVL_ERROR, LOGOUTPUT_CONSOLE);
+                log_link(LOGLVL_WARNING, LOGOUTPUT_CONSOLE);
+        }
+
         b_main_init();
 
@@ -104 +112 @@
         }
 
+        global.auth = auth_init(global.conf->auth_backend);
+        if (global.conf->auth_backend && global.auth == NULL) {
+                log_message(LOGLVL_ERROR, "Unable to load authentication backend '%s'", global.conf->auth_backend);
+                return(1);
+        }
+
         if (global.conf->runmode == RUNMODE_INETD) {
-                log_link(LOGLVL_ERROR, LOGOUTPUT_IRC);
-                log_link(LOGLVL_WARNING, LOGOUTPUT_IRC);
-
                 i = bitlbee_inetd_init();
                 log_message(LOGLVL_INFO, "%s %s starting in inetd mode.", PACKAGE, BITLBEE_VERSION);
 
         } else if (global.conf->runmode == RUNMODE_DAEMON) {
-                log_link(LOGLVL_ERROR, LOGOUTPUT_CONSOLE);
-                log_link(LOGLVL_WARNING, LOGOUTPUT_CONSOLE);
-
                 i = bitlbee_daemon_init();
                 log_message(LOGLVL_INFO, "%s %s starting in daemon mode.", PACKAGE, BITLBEE_VERSION);
         } else if (global.conf->runmode == RUNMODE_FORKDAEMON) {
-                log_link(LOGLVL_ERROR, LOGOUTPUT_CONSOLE);
-                log_link(LOGLVL_WARNING, LOGOUTPUT_CONSOLE);
-
                 /* In case the operator requests a restart, we need this. */
                 old_cwd = g_malloc(256);