X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=0f299bfc77f521c1121a3c7dc1dd01cc4115c507;hb=3a1cf980bc110e17ade538de22703ba001fc61ee;hp=8ecdec8431f66c7a3d6d7cd58a7d2d2ad80ceac2;hpb=cd49d168981fb16f0655c506244f1d39e12d1bf4;p=citadel.git

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 8ecdec843..0f299bfc7 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996-2013 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 version 3.
@@ -56,6 +56,7 @@ extern StrBuf *I18nDump;
 void InitTemplateCache(void);
 extern int LoadTemplates;
 
+void LoadMimeBlacklist(void);
 
 /*
  * Here's where it all begins.
@@ -148,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;
@@ -223,11 +224,12 @@ 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(LOG_NOTICE, "%s", PACKAGE_STRING);
-	syslog(LOG_NOTICE, "Copyright (C) 1996-2013 by the citadel.org team");
+	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.");