Changes in unix.c [cd63d58:823de9d]

File:

• unix.c (modified) (4 diffs)

unix.c

@@ -27 +27 @@
 #include "commands.h"
 #include "crypting.h"
+#include "otr.h"
 #include "protocols/nogaim.h"
 #include "help.h"
 #include "ipc.h"
+#include "lib/ssl_client.h"
 #include <signal.h>
 #include <unistd.h>
@@ -54 +56 @@
         b_main_init();
         nogaim_init();
+        /* Ugly Note: libotr and gnutls both use libgcrypt. libgcrypt
+           has a process-global config state whose initialization happpens
+           twice if libotr and gnutls are used together. libotr installs custom
+           memory management functions for libgcrypt while our gnutls module
+           uses the defaults. Therefore we initialize OTR after SSL. *sigh* */
+        ssl_init();
+        otr_init();
         
         srand( time( NULL ) ^ getpid() );
@@ -60 +69 @@
         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, "Bitlbee %s starting in inetd mode.", BITLBEE_VERSION );
@@ -66 +78 @@
         else if( global.conf->runmode == RUNMODE_DAEMON )
         {
+                log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
+
                 i = bitlbee_daemon_init();
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );