It's 2012.

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 55ec9f578ee07e6f9923d394b23592861dfcbe06..592ea7708bbc620f518e10eb21af59406b86642d 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,21 +1,15 @@
 /*
  * citserver's main() function lives here.
  * 
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2012 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 as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "sysdep.h"
@@ -133,11 +127,12 @@ int main(int argc, char **argv)
 
                else if (!strncmp(argv[a], "-h", 2)) {
                        relh=argv[a][2]!='/';
-                       if (!relh) safestrncpy(ctdl_home_directory, &argv[a][2],
-                                                                  sizeof ctdl_home_directory);
-                       else
-                               safestrncpy(relhome, &argv[a][2],
-                                                       sizeof relhome);
+                       if (!relh) {
+                               safestrncpy(ctdl_home_directory, &argv[a][2], sizeof ctdl_home_directory);
+                       }
+                       else {
+                               safestrncpy(relhome, &argv[a][2], sizeof relhome);
+                       }
                        home=1;
                }
 
@@ -146,14 +141,7 @@ int main(int argc, char **argv)
                }
 
                else if (!strncmp(argv[a], "-t", 2)) {
-                       if (freopen(&argv[a][2], "w", stderr) != stderr)
-                       {
-                               syslog(LOG_EMERG, 
-                                             "unable to open your trace log [%s]: %s", 
-                                             &argv[a][2], 
-                                             strerror(errno));
-                               exit(1);
-                       }
+                       /* deprecated */
                }
 
                else if (!strncmp(argv[a], "-D", 2)) {
@@ -163,8 +151,9 @@ int main(int argc, char **argv)
                /* -r tells the server not to drop root permissions. don't use
                 * this unless you know what you're doing. this should be
                 * removed in the next release if it proves unnecessary. */
-               else if (!strcmp(argv[a], "-r"))
+               else if (!strcmp(argv[a], "-r")) {
                        drop_root_perms = 0;
+               }
 
                /* any other parameter makes it crash and burn */
                else {
@@ -172,7 +161,6 @@ int main(int argc, char **argv)
                                        "citserver "
                                        "[-lLogFacility] "
                                        "[-d] [-D] [-s] "
-                                       "[-tTraceFile] "
                                        "[-hHomeDir]\n"
                        );
                        exit(1);
@@ -214,7 +202,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-2011 by the Citadel development team.");
+       syslog(LOG_NOTICE, "Copyright (C) 1987-2012 by the Citadel development team.");
        syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
                                        "General Public License.");
        syslog(LOG_NOTICE, " ");
@@ -316,7 +304,7 @@ int main(int argc, char **argv)
        /*
         * Load any server-side extensions available here.
         */
-       syslog(LOG_INFO, "Initializing server extensions\n");
+       syslog(LOG_INFO, "Initializing server extensions");
        
        initialise_modules(0);
 
@@ -353,18 +341,18 @@ int main(int argc, char **argv)
 #endif // HAVE_GETPWUID_R
 
                if (pwp == NULL)
-                       syslog(LOG_CRIT, "WARNING: getpwuid(%ld): %s\n"
+                       syslog(LOG_CRIT, "WARNING: getpwuid(%ld): %s"
                                   "Group IDs will be incorrect.\n", (long)CTDLUID,
                                strerror(errno));
                else {
                        initgroups(pw.pw_name, pw.pw_gid);
                        if (setgid(pw.pw_gid))
-                               syslog(LOG_CRIT, "setgid(%ld): %s\n", (long)pw.pw_gid,
+                               syslog(LOG_CRIT, "setgid(%ld): %s", (long)pw.pw_gid,
                                        strerror(errno));
                }
-               syslog(LOG_INFO, "Changing uid to %ld\n", (long)CTDLUID);
+               syslog(LOG_INFO, "Changing uid to %ld", (long)CTDLUID);
                if (setuid(CTDLUID) != 0) {
-                       syslog(LOG_CRIT, "setuid() failed: %s\n", strerror(errno));
+                       syslog(LOG_CRIT, "setuid() failed: %s", strerror(errno));
                }
 #if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)
                prctl(PR_SET_DUMPABLE, 1);