Began removing $Id$ tags. This will be an ongoing process.

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index bdcdac46ed264fdeaf3b1f4bd31733560492235c..d4558f86d5299c3061406adbe70a3d869d474ceb 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,23 +1,21 @@
 /*
- * $Id$
- *
  * citserver's main() function lives here.
  * 
  * Copyright (c) 1987-2010 by the citadel.org team
  *
- *  This program is free 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.
+ * This program is free 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.
  *
- *  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.
+ * 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
+ * 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"
@@ -106,6 +104,8 @@ int main(int argc, char **argv)
        int relh=0;
        int home=0;
        int dbg=0;
+       int have_log=0;
+       int have_minus_x=0;
        char relhome[PATH_MAX]="";
        char ctdldir[PATH_MAX]=CTDLDIR;
 #ifdef HAVE_RUN_DIR
@@ -152,6 +152,7 @@ int main(int argc, char **argv)
                /* -x specifies the desired logging level */
                else if (!strncmp(argv[a], "-x", 2)) {
                        verbosity = atoi(&argv[a][2]);
+                       have_minus_x = 1;
                }
 
                else if (!strncmp(argv[a], "-h", 2)) {
@@ -173,6 +174,7 @@ int main(int argc, char **argv)
                                              strerror(errno));
                                exit(1);
                        }
+                       have_log = 1;
                }
 
                else if (!strncmp(argv[a], "-D", 2)) {
@@ -198,6 +200,9 @@ int main(int argc, char **argv)
 
        }
 
+       if (have_minus_x && running_as_daemon && have_log)
+               print_to_logfile = 1;
+
        calc_dirs_n_files(relh, home, relhome, ctdldir, dbg);
        /* daemonize, if we were asked to */
        if (running_as_daemon) {