X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=0f299bfc77f521c1121a3c7dc1dd01cc4115c507;hb=3a1cf980bc110e17ade538de22703ba001fc61ee;hp=e8214883794ae063bbb8a9e8559a8a5f3286db07;hpb=de0c66402d252e10fbc3978b843ea1a991a8e92c;p=citadel.git diff --git a/webcit/webserver.c b/webcit/webserver.c index e82148837..0f299bfc7 100644 --- a/webcit/webserver.c +++ b/webcit/webserver.c @@ -1,28 +1,19 @@ /* - * Copyright (c) 1996-2011 by the citadel.org team + * Copyright (c) 1996-2014 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. + * modify 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 "webcit.h" #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 */ @@ -65,6 +56,7 @@ extern StrBuf *I18nDump; void InitTemplateCache(void); extern int LoadTemplates; +void LoadMimeBlacklist(void); /* * Here's where it all begins. @@ -157,8 +149,8 @@ int main(int argc, char **argv) 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; @@ -178,7 +170,7 @@ int main(int argc, char **argv) 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); } } @@ -232,45 +224,41 @@ int main(int argc, char **argv) } 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-2011 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 as published"); - syslog(1, "by the Free Software Foundation, either version 3 of the License, or"); - syslog(1, "(at your option) any later version."); - 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(1, "You should have received a copy of the GNU General Public License"); - syslog(1, "along with this program. If not, see ."); - syslog(1, " "); - + syslog(LOG_NOTICE, "%s", PACKAGE_STRING); + syslog(LOG_NOTICE, "Copyright (C) 1996-2014 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 */ initialise_modules(); + initialise2_modules(); InitTemplateCache(); if (DumpTemplateI18NStrings) { 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); @@ -290,7 +278,7 @@ int main(int argc, char **argv) * 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_EMERG, "Can't create TSD key: %s", strerror(errno)); } InitialiseSemaphores(); @@ -302,7 +290,7 @@ int main(int argc, char **argv) */ #ifdef HAVE_OPENSSL if (pthread_key_create(&ThreadSSL, NULL) != 0) { - syslog(1, "Can't create TSD key: %s", strerror(errno)); + syslog(LOG_EMERG, "Can't create TSD key: %s", strerror(errno)); } #endif @@ -313,11 +301,11 @@ int main(int argc, char **argv) */ 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) @@ -326,7 +314,7 @@ int main(int argc, char **argv) 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);