X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsysdep.c;h=1278b56259ea984b8bf3a6c4b5437bfe1544208f;hb=c73091a2ae896b6be5aa94b911c1c89d76a85688;hp=fb34a4cef9d04b7c748f286412cb5d539e17108e;hpb=ccfce1854b9c2547d9b87ce07185d68b0df76d9e;p=citadel.git

diff --git a/webcit/sysdep.c b/webcit/sysdep.c
index fb34a4cef..1278b5625 100644
--- a/webcit/sysdep.c
+++ b/webcit/sysdep.c
@@ -25,18 +25,7 @@
 #include <sys/socket.h>
 #include <syslog.h>
 #include <sys/syslog.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <limits.h>
 #include <sys/resource.h>
 #include <netinet/in.h>
@@ -82,7 +71,6 @@ char file_crpt_file_cer[PATH_MAX]="";
 char file_etc_mimelist[PATH_MAX]="";
 
 const char editor_absolut_dir[PATH_MAX]=EDITORDIR;	/* nailed to what configure gives us. */
-const char markdown_editor_absolutedir[]=MARKDOWNEDITORDIR;
 
 char etc_dir[PATH_MAX];
 char static_dir[PATH_MAX];		/* calculated on startup */
@@ -92,8 +80,7 @@ char  *static_dirs[]={				/* needs same sort order as the web mapping */
 	(char*)static_dir,			/* our templates on disk */
 	(char*)static_local_dir,		/* user provided templates disk */
 	(char*)editor_absolut_dir,		/* the editor on disk */
-	(char*)static_icon_dir,                  /* our icons... */
-	(char*)markdown_editor_absolutedir
+	(char*)static_icon_dir                  /* our icons... */
 };
 
 int ExitPipe[2];
@@ -192,6 +179,8 @@ void end_critical_section(int which_one)
 
 void ShutDownWebcit(void)
 {
+
+	DeleteHash(&GZMimeBlackList);
 	free_zone_directory ();
 	icaltimezone_release_zone_tab ();
 	icalmemory_free_ring ();
@@ -566,6 +555,9 @@ webcit_calc_dirs_n_files(int relh, const char *basedir, int home, char *webcitdi
 void drop_root(uid_t UID)
 {
 	struct passwd pw, *pwp = NULL;
+#ifdef HAVE_GETPWUID_R
+	char pwbuf[SIZ];
+#endif
 
 	/*
 	 * Now that we've bound the sockets, change to the Citadel user id and its