/*
- * Copyright (c) 1996-2012 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.
#include "webserver.h"
#include "modules_init.h"
-#ifndef HAVE_SNPRINTF
-int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp);
-#endif
extern int msock; /* master listening socket */
extern char static_icon_dir[PATH_MAX]; /* where should we find our mime icons */
const char foobuf[32];
const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;}
#endif
+extern int verbose;
extern int dbg_analyze_msg;
extern int dbg_backtrace_template_errors;
extern int DumpTemplateI18NStrings;
void InitTemplateCache(void);
extern int LoadTemplates;
+void LoadMimeBlacklist(void);
/*
* Here's where it all begins.
/* 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);
}
/* Parse command line */
#ifdef HAVE_OPENSSL
- while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfsS:Z")) != EOF)
+ while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfsS:Z:v:")) != EOF)
#else
- while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfZ")) != EOF)
+ while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfZ:v:")) != EOF)
#endif
switch (a) {
case 'u':
break;
case 'T':
LoadTemplates = atoi(optarg);
- dbg_analyze_msg = (LoadTemplates && (1<<1)) != 0;
- dbg_backtrace_template_errors = (LoadTemplates && (1<<2)) != 0;
+ dbg_analyze_msg = (LoadTemplates & (1<<1)) != 0;
+ dbg_backtrace_template_errors = (LoadTemplates & (1<<2)) != 0;
break;
case 'Z':
DisableGzip = 1;
if (gethostname
(&server_cookie[strlen(server_cookie)],
200) != 0) {
- syslog(2, "gethostname: %s", strerror(errno));
+ syslog(LOG_INFO, "gethostname: %s", strerror(errno));
free(server_cookie);
}
}
I18nDump = NewStrBufPlain(HKEY("int templatestrings(void)\n{\n"));
I18nDumpFile = optarg;
break;
+ case 'v':
+ 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
}
webcit_calc_dirs_n_files(relh, basedir, home, webcitdir, relhome);
+ LoadMimeBlacklist();
LoadIconDir(static_icon_dir);
/* Tell 'em who's in da house */
- syslog(1, "%s", PACKAGE_STRING);
- syslog(1, "Copyright (C) 1996-2012 by the citadel.org team");
- syslog(1, " ");
- syslog(1, "This program is open source software: you can redistribute it and/or");
- syslog(1, "modify it under the terms of the GNU General Public License, version 3.");
- syslog(1, " ");
- syslog(1, "This program is distributed in the hope that it will be useful,");
- syslog(1, "but WITHOUT ANY WARRANTY; without even the implied warranty of");
- syslog(1, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the");
- syslog(1, "GNU General Public License for more details.");
- syslog(1, " ");
+ syslog(LOG_NOTICE, "%s", PACKAGE_STRING);
+ 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.");
+ syslog(LOG_NOTICE, " ");
+ syslog(LOG_NOTICE, "This program is distributed in the hope that it will be useful,");
+ syslog(LOG_NOTICE, "but WITHOUT ANY WARRANTY; without even the implied warranty of");
+ syslog(LOG_NOTICE, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the");
+ syslog(LOG_NOTICE, "GNU General Public License for more details.");
+ syslog(LOG_NOTICE, " ");
/* initialize various subsystems */
FILE *fd;
StrBufAppendBufPlain(I18nDump, HKEY("}\n"), 0);
if (StrLength(I18nDump) < 50) {
- syslog(1, "*******************************************************************\n");
- syslog(1, "* No strings found in templates! Are you sure they're there? *\n");
- syslog(1, "*******************************************************************\n");
+ syslog(LOG_INFO, "*******************************************************************\n");
+ syslog(LOG_INFO, "* No strings found in templates! Are you sure they're there? *\n");
+ syslog(LOG_INFO, "*******************************************************************\n");
return -1;
}
fd = fopen(I18nDumpFile, "w");
if (fd == NULL) {
- syslog(1, "***********************************************\n");
- syslog(1, "* unable to open I18N dumpfile [%s] *\n", I18nDumpFile);
- syslog(1, "***********************************************\n");
+ syslog(LOG_INFO, "***********************************************\n");
+ syslog(LOG_INFO, "* unable to open I18N dumpfile [%s] *\n", I18nDumpFile);
+ syslog(LOG_INFO, "***********************************************\n");
return -1;
}
fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd);
}
/* 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/");
* wcsession struct to which the thread is currently bound.
*/
if (pthread_key_create(&MyConKey, NULL) != 0) {
- syslog(1, "Can't create TSD key: %s", strerror(errno));
+ syslog(LOG_ERR, "Can't create TSD key: %s", strerror(errno));
}
InitialiseSemaphores();
*/
#ifdef HAVE_OPENSSL
if (pthread_key_create(&ThreadSSL, NULL) != 0) {
- syslog(1, "Can't create TSD key: %s", strerror(errno));
+ syslog(LOG_ERR, "Can't create TSD key: %s", strerror(errno));
}
#endif
*/
if (!IsEmptyStr(uds_listen_path)) {
- syslog(2, "Attempting to create listener socket at %s...", uds_listen_path);
+ syslog(LOG_DEBUG, "Attempting to create listener socket at %s...", uds_listen_path);
msock = webcit_uds_server(uds_listen_path, LISTEN_QUEUE_LENGTH);
}
else {
- syslog(2, "Attempting to bind to port %d...", http_port);
+ syslog(LOG_DEBUG, "Attempting to bind to port %d...", http_port);
msock = webcit_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH);
}
if (msock < 0)
return -msock;
}
- syslog(2, "Listening on socket %d", msock);
+ syslog(LOG_INFO, "Listening on socket %d", msock);
signal(SIGPIPE, SIG_IGN);
pthread_mutex_init(&SessionListMutex, NULL);
projects / citadel.git / blobdiff