X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsysdep.c;h=bba4147aa50da6d13059fcfcbd02ff4624f13163;hb=37cdd9932e7854c7bde2b83a0b4f5f6aad105306;hp=94314a25cfdefff982f76f9fee59710c1e713674;hpb=6636ac9321f0ddb1cc2d21c5f806576396651e38;p=citadel.git

diff --git a/webcit/sysdep.c b/webcit/sysdep.c
index 94314a25c..bba4147aa 100644
--- a/webcit/sysdep.c
+++ b/webcit/sysdep.c
@@ -70,19 +70,15 @@ char file_crpt_file_csr[PATH_MAX]="";
 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 */
 char static_local_dir[PATH_MAX];		/* calculated on startup */
 char static_icon_dir[PATH_MAX];          /* where should we find our mime icons? */
 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
+	"./static",
+	"./static.local",
+	"./tiny_mce",
+	"./static/webcit_icons"
 };
 
 int ExitPipe[2];
@@ -557,6 +553,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