It's 2018 here in the civilized world. Changed the copyright banners of both Citadel...

diff --git a/citadel/server_main.c b/citadel/server_main.c
index a71a5cfce821683a4c7d65fbab22acc85c21d031..536612ad7bea3f0e8f7559c5202e588737225291 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-2017 by the citadel.org team
+ * Copyright (c) 1987-2018 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.
@@ -213,15 +213,22 @@ int main(int argc, char **argv)
        syslog(LOG_INFO, " ");
        syslog(LOG_INFO, "*** Citadel server engine ***\n");
        syslog(LOG_INFO, "Version %d (build %s) ***", REV_LEVEL, svn_revision());
-       syslog(LOG_INFO, "Copyright (C) 1987-2017 by the Citadel development team.");
-       syslog(LOG_INFO, "This program is distributed under the terms of the GNU General Public License.");
+       syslog(LOG_INFO, "Copyright (C) 1987-2018 by the Citadel development team.");
+       syslog(LOG_INFO, " ");
+       syslog(LOG_INFO, "This program is open source software: you can redistribute it and/or");
+       syslog(LOG_INFO, "modify it under the terms of the GNU General Public License, version 3.");
+       syslog(LOG_INFO, " ");
+       syslog(LOG_INFO, "This program is distributed in the hope that it will be useful,");
+       syslog(LOG_INFO, "but WITHOUT ANY WARRANTY; without even the implied warranty of");
+       syslog(LOG_INFO, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the");
+       syslog(LOG_INFO, "GNU General Public License for more details.");
        syslog(LOG_INFO, " ");
        syslog(LOG_INFO, "%s", libcitadel_version_string());
 
 #ifdef HAVE_RUN_DIR
        /* on some dists rundir gets purged on startup. so we need to recreate it. */
 
-       if (stat(ctdl_run_dir, &filestats)==-1){
+       if (stat(ctdl_run_dir, &filestats) == -1) {
 #ifdef HAVE_GETPWUID_R
 #ifdef SOLARIS_GETPWUID
                pwp = getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf));
@@ -322,13 +329,11 @@ int main(int argc, char **argv)
                start_chkpwd_daemon();
        }
 
-
        /*
         * check, whether we're fired up another time after a crash.
         * if, post an aide message, so the admin has a chance to react.
         */
-       checkcrash ();
-
+       checkcrash();
 
        /*
         * Now that we've bound the sockets, change to the Citadel user id and its

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 99e303a098ddfb9aedc85d9a9fc353454ae321a4..df2d15098dda0925b61f93533603279a19eec020 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996-2017 by the citadel.org team
+ * Copyright (c) 1996-2018 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.
@@ -234,7 +234,7 @@ int main(int argc, char **argv)
 
        /* Tell 'em who's in da house */
        syslog(LOG_NOTICE, "%s", PACKAGE_STRING);
-       syslog(LOG_NOTICE, "Copyright (C) 1996-2017 by the citadel.org team");
+       syslog(LOG_NOTICE, "Copyright (C) 1996-2018 by the citadel.org team");
        syslog(LOG_NOTICE, " ");
        syslog(LOG_NOTICE, "This program is open source software: you can redistribute it and/or");
        syslog(LOG_NOTICE, "modify it under the terms of the GNU General Public License, version 3.");