Bring in new dkim code

[citadel.git] / webcit / sysdep.c

diff --git a/webcit/sysdep.c b/webcit/sysdep.c
index 94314a25cfdefff982f76f9fee59710c1e713674..e5f928d521caf8b85b4bc56ead6a50beb6eec9dd 100644 (file)
--- a/webcit/sysdep.c
+++ b/webcit/sysdep.c
@@ -1,7 +1,7 @@
 /*
  * WebCit "system dependent" code.
  *
- * Copyright (c) 1996-2012 by the citadel.org team
+ * Copyright (c) 1996-2021 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.
@@ -48,7 +48,7 @@
 #include <sys/select.h>
 #endif
 
-#include "webserver.h"
+
 #include "modules_init.h"
 #if HAVE_BACKTRACE
 #include <execinfo.h>
@@ -64,25 +64,17 @@ extern void *context_loop(ParsedHttpHdrs *Hdr);
 extern void *housekeeping_loop(void);
 extern void do_housekeeping(void);
 
-char ctdl_key_dir[PATH_MAX]=SSL_DIR;
-char file_crpt_file_key[PATH_MAX]="";
-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];
@@ -137,10 +129,9 @@ void LoadMimeBlacklist(void)
 void CheckGZipCompressionAllowed(const char *MimeType, long MLen)
 {
        void *v;
-       wcsession *WCC = WC;
 
-       if (WCC->Hdr->HR.gzip_ok)
-           WCC->Hdr->HR.gzip_ok = GetHash(GZMimeBlackList, MimeType, MLen, &v) == 0;
+       if (WC->Hdr->HR.gzip_ok)
+           WC->Hdr->HR.gzip_ok = GetHash(GZMimeBlackList, MimeType, MLen, &v) == 0;
 }
 
 void InitialiseSemaphores(void)
@@ -188,11 +179,6 @@ void ShutDownWebcit(void)
        icalmemory_free_ring ();
        ShutDownLibCitadel ();
        shutdown_modules ();
-#ifdef HAVE_OPENSSL
-       if (is_https) {
-               shutdown_ssl();
-       }
-#endif
 }
 
 /*
@@ -525,20 +511,6 @@ webcit_calc_dirs_n_files(int relh, const char *basedir, int home, char *webcitdi
        StripSlashes(static_icon_dir, 1);
        StripSlashes(static_local_dir, 1);
 
-       snprintf(file_crpt_file_key,
-                sizeof file_crpt_file_key, 
-                "%s/citadel.key",
-                ctdl_key_dir);
-       snprintf(file_crpt_file_csr,
-                sizeof file_crpt_file_csr, 
-                "%s/citadel.csr",
-                ctdl_key_dir);
-       snprintf(file_crpt_file_cer,
-                sizeof file_crpt_file_cer, 
-                "%s/citadel.cer",
-                ctdl_key_dir);
-
-
        basedir=ETCDIR;
        COMPUTE_DIRECTORY(etc_dir);
        StripSlashes(etc_dir, 1);
@@ -557,6 +529,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