Changed the year in the copyright banner(s) to 2019.

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 2f581356ab81eab1c29a8259971ec52b9419c46c..e814364d17a3e468bc9f1868ce0916baa91da0fa 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996-2014 by the citadel.org team
+ * Copyright (c) 1996-2019 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.
@@ -90,10 +90,8 @@ int main(int argc, char **argv)
 
        /* Ensure that we are linked to the correct version of libcitadel */
        if (libcitadel_version_number() < LIBCITADEL_VERSION_NUMBER) {
-               fprintf(stderr, " You are running libcitadel version %d.%02d\n",
-                       (libcitadel_version_number() / 100), (libcitadel_version_number() % 100));
-               fprintf(stderr, "WebCit was compiled against version %d.%02d\n",
-                       (LIBCITADEL_VERSION_NUMBER / 100), (LIBCITADEL_VERSION_NUMBER % 100));
+               fprintf(stderr, " You are running libcitadel version %d\n", libcitadel_version_number() );
+               fprintf(stderr, "WebCit was compiled against version %d\n", LIBCITADEL_VERSION_NUMBER );
                return(1);
        }
 
@@ -194,11 +192,14 @@ int main(int argc, char **argv)
                        verbose=1;
                        break;
                default:
-                       fprintf(stderr, "usage: webcit "
+                       fprintf(stderr, "usage:\nwebcit "
                                "[-i ip_addr] [-p http_port] "
                                "[-c] [-f] "
                                "[-T Templatedebuglevel] "
                                "[-d] [-Z] [-G i18ndumpfile] "
+                               "[-u uid] [-h homedirectory] "
+                               "[-D daemonizepid] [-v] "
+                               "[-g defaultlandingpage] [-B basesize] "
 #ifdef HAVE_OPENSSL
                                "[-s] [-S cipher_suites]"
 #endif
@@ -233,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-2014 by the citadel.org team");
+       syslog(LOG_NOTICE, "Copyright (C) 1996-2019 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.");
@@ -271,7 +272,12 @@ int main(int argc, char **argv)
        }
 
        /* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */
-       icalerror_errors_are_fatal = 0;
+
+#ifdef LIBICAL_ICAL_EXPORT     // cheap and sleazy way to detect libical >=2.0
+               icalerror_set_errors_are_fatal(0);
+#else
+               icalerror_errors_are_fatal = 0;
+#endif
 
        /* Use our own prefix on tzid's generated from system tzdata */
        icaltimezone_set_tzid_prefix("/citadel.org/");
@@ -282,7 +288,7 @@ int main(int argc, char **argv)
         * wcsession struct to which the thread is currently bound.
         */
        if (pthread_key_create(&MyConKey, NULL) != 0) {
-               syslog(LOG_EMERG, "Can't create TSD key: %s", strerror(errno));
+               syslog(LOG_ERR, "Can't create TSD key: %s", strerror(errno));
        }
        InitialiseSemaphores();
 
@@ -294,7 +300,7 @@ int main(int argc, char **argv)
         */
 #ifdef HAVE_OPENSSL
        if (pthread_key_create(&ThreadSSL, NULL) != 0) {
-               syslog(LOG_EMERG, "Can't create TSD key: %s", strerror(errno));
+               syslog(LOG_ERR, "Can't create TSD key: %s", strerror(errno));
        }
 #endif