Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 9c5d2fe5635fe84be0810319f35db1bec66dbe8f..3b1be910d02de6e2dac33d95a454f0725014ffc1 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,7 +1,7 @@
 /*
  * citserver's main() function lives here.
  * 
- * Copyright (c) 1987-2013 by the citadel.org team
+ * Copyright (c) 1987-2014 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -24,6 +24,7 @@
 #include "serv_extensions.h"
 #include "citadel_dirs.h"
 #include "user_ops.h"
+#include "ecrash.h"
 
 const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
@@ -130,7 +131,8 @@ int main(int argc, char **argv)
                drop_root_perms = 1;
        }
 
-#ifdef HAVE_BACKTRACE
+#if 0
+ def HAVE_BACKTRACE
        bzero(&params, sizeof(params));
        params.filename = file_pid_paniclog;
        panic_fd=open(file_pid_paniclog, O_APPEND|O_CREAT|O_DIRECT);
@@ -152,7 +154,7 @@ int main(int argc, char **argv)
        syslog(LOG_NOTICE,
                "*** Citadel server engine v%d.%02d (build %s) ***",
                (REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
-       syslog(LOG_NOTICE, "Copyright (C) 1987-2013 by the Citadel development team.");
+       syslog(LOG_NOTICE, "Copyright (C) 1987-2014 by the Citadel development team.");
        syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
                                        "General Public License.");
        syslog(LOG_NOTICE, " ");