X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsysdep.c;h=1278b56259ea984b8bf3a6c4b5437bfe1544208f;hb=c73091a2ae896b6be5aa94b911c1c89d76a85688;hp=94314a25cfdefff982f76f9fee59710c1e713674;hpb=6636ac9321f0ddb1cc2d21c5f806576396651e38;p=citadel.git diff --git a/webcit/sysdep.c b/webcit/sysdep.c index 94314a25c..1278b5625 100644 --- a/webcit/sysdep.c +++ b/webcit/sysdep.c @@ -71,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 */ @@ -81,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]; @@ -557,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