Changed the naming convention of the setup wizard filename
[citadel.git] / webcit / webserver.c
index d6f56d77312a440b951aaf3b6160c80fd0c48a93..612ac5d086507408efc3119001df8b84115bc917 100644 (file)
 /*
- * $Id$
- *
  * This contains a simple multithreaded TCP server manager.  It sits around
  * waiting on the specified port for incoming HTTP connections.  When a
  * connection is established, it calls context_loop() from context_loop.c.
  *
+ * Copyright (c) 1996-2011 by the citadel.org developers.
+ * This program is released under the terms of the GNU General Public License v3.
+ *
  */
 
-/*
- * Uncomment to dump an HTTP trace to stderr
-#define HTTP_TRACING 1
- */
-
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
+#include "modules_init.h"
 #ifndef HAVE_SNPRINTF
 int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp);
 #endif
 
-int verbosity = 9;             /* Logging level */
-int msock;                     /* master listening socket */
+
+extern int msock;                      /* master listening socket */
+extern int verbosity;          /* Logging level */
+extern char static_icon_dir[PATH_MAX];          /* where should we find our mime icons */
 int is_https = 0;              /* Nonzero if I am an HTTPS service */
-extern void *context_loop(int);
-extern void *housekeeping_loop(void);
+int follow_xff = 0;            /* Follow X-Forwarded-For: header */
+int DisableGzip = 0;
+struct redirector *redir = NULL;
+char *default_landing_page = NULL;
+int num_redir = 0;
 extern pthread_mutex_t SessionListMutex;
 extern pthread_key_t MyConKey;
 
+extern void *housekeeping_loop(void);
+extern int webcit_tcp_server(char *ip_addr, int port_number, int queue_len);
+extern int webcit_uds_server(char *sockpath, int queue_len);
+extern void graceful_shutdown_watcher(int signum);
+extern void graceful_shutdown(int signum);
+extern void start_daemon(char *pid_file);
+extern void webcit_calc_dirs_n_files(int relh, const char *basedir, int home, char *webcitdir, char *relhome);
+extern void worker_entry(void);
+extern void drop_root(uid_t UID);
+
+char socket_dir[PATH_MAX];     /* where to talk to our citadel server */
+char *server_cookie = NULL;    /* our Cookie connection to the client */
+int http_port = PORT_NUM;      /* Port to listen on */
+char *ctdlhost = DEFAULT_HOST; /* Host name or IP address of Citadel server */
+char *ctdlport = DEFAULT_PORT; /* Port number of Citadel server */
+int setup_wizard = 0;          /* should we run the setup wizard? */
+char wizard_filename[PATH_MAX];        /* location of file containing the last webcit version against which we ran setup wizard */
+int running_as_daemon = 0;     /* should we deamonize on startup? */
+
+
+/* #define DBG_PRINNT_HOOKS_AT_START */
+#ifdef DBG_PRINNT_HOOKS_AT_START
+extern HashList *HandlerHash;
+const char foobuf[32];
+const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;}
+#endif 
+extern int dbg_analyze_msg;
+extern int dbg_backtrace_template_errors;
+extern int DumpTemplateI18NStrings;
+extern StrBuf *I18nDump;
+void InitTemplateCache(void);
+extern int LoadTemplates;
 
-char *server_cookie = NULL;
-
-
-char *ctdlhost = DEFAULT_HOST;
-char *ctdlport = DEFAULT_PORT;
-
-/*
- * This is a generic function to set up a master socket for listening on
- * a TCP port.  The server shuts down if the bind fails.
- */
-int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
-{
-       struct sockaddr_in sin;
-       int s, i;
-
-       memset(&sin, 0, sizeof(sin));
-       sin.sin_family = AF_INET;
-       if (ip_addr == NULL) {
-               sin.sin_addr.s_addr = INADDR_ANY;
-       }
-       else {
-               sin.sin_addr.s_addr = inet_addr(ip_addr);
-       }
-
-       if (sin.sin_addr.s_addr == INADDR_NONE) {
-               sin.sin_addr.s_addr = INADDR_ANY;
-       }
-
-       if (port_number == 0) {
-               lprintf(1, "Cannot start: no port number specified.\n");
-               exit(1);
-       }
-       sin.sin_port = htons((u_short) port_number);
 
-       s = socket(PF_INET, SOCK_STREAM, (getprotobyname("tcp")->p_proto));
-       if (s < 0) {
-               lprintf(1, "Can't create a socket: %s\n",
-                      strerror(errno));
-               exit(errno);
-       }
-       /* Set some socket options that make sense. */
-       i = 1;
-       setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
 
-       if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
-               lprintf(1, "Can't bind: %s\n", strerror(errno));
-               exit(errno);
-       }
-       if (listen(s, queue_len) < 0) {
-               lprintf(1, "Can't listen: %s\n", strerror(errno));
-               exit(errno);
-       }
-       return (s);
-}
 
 
 /*
- * Read data from the client socket.
- * Return values are:
- *      1       Requested number of bytes has been read.
- *      0       Request timed out.
- *     -1      Connection is broken, or other error.
+ * Handle redirects to legacy web servers
  */
-int client_read_to(int sock, char *buf, int bytes, int timeout)
-{
-       int len, rlen;
-       fd_set rfds;
-       struct timeval tv;
-       int retval;
-
-
-#ifdef HAVE_OPENSSL
-       if (is_https) {
-               return(client_read_ssl(buf, bytes, timeout));
-       }
-#endif
-
-       len = 0;
-       while (len < bytes) {
-               FD_ZERO(&rfds);
-               FD_SET(sock, &rfds);
-               tv.tv_sec = timeout;
-               tv.tv_usec = 0;
-
-               retval = select((sock) + 1,
-                               &rfds, NULL, NULL, &tv);
-               if (FD_ISSET(sock, &rfds) == 0) {
-                       return (0);
+void handle_redir(void) {
+       if (num_redir > 0) {
+               int i;
+               const char *req = ChrPtr(WC->Hdr->this_page);
+               if (!req) {
+                       do_404();
+                       return;
                }
-
-               rlen = read(sock, &buf[len], bytes - len);
-
-               if (rlen < 1) {
-                       lprintf(2, "client_read() failed: %s\n",
-                              strerror(errno));
-                       return(-1);
+               if (req[0] == '/') ++req;
+               syslog(9, "handle_redir() called; redirect this: %s", req);
+               for (i=0; i<num_redir; ++i) {
+                       if (!strncmp(redir[i].urlpart, req, strlen(redir[i].urlpart))) {
+                               char go_here[1024];
+                               snprintf(go_here, sizeof go_here, redir[i].redirect_to, req);
+                               syslog(9, "redirecting to: %s", go_here);
+                               http_redirect(go_here);
+                               return;
+                       }
                }
-               len = len + rlen;
-       }
-
-#ifdef HTTP_TRACING
-       write(2, "\033[32m", 5);
-       write(2, buf, bytes);
-       write(2, "\033[30m", 5);
-#endif
-       return (1);
-}
-
-
-ssize_t client_write(const void *buf, size_t count) {
-
-       if (WC->burst != NULL) {
-               WC->burst = realloc(WC->burst, (WC->burst_len + count + 2));
-               memcpy(&WC->burst[WC->burst_len], buf, count);
-               WC->burst_len += count;
-               return(count);
-       }
-
-#ifdef HAVE_OPENSSL
-       if (is_https) {
-               client_write_ssl((char *)buf, count);
-               return(count);
-       }
-#endif
-#ifdef HTTP_TRACING
-       write(2, "\033[34m", 5);
-       write(2, buf, count);
-       write(2, "\033[30m", 5);
-#endif
-       return(write(WC->http_sock, buf, count));
-}
-
-
-void begin_burst(void) {
-       if (WC->burst != NULL) {
-               free(WC->burst);
-               WC->burst = NULL;
        }
-       WC->burst_len = 0;
-       WC->burst = malloc(SIZ);
+       do_404();
 }
 
-void end_burst(void) {
-       size_t the_len;
-       char *the_data;
-
-       the_len = WC->burst_len;
-       the_data = WC->burst;
-
-       WC->burst_len = 0;
-       WC->burst = NULL;
-
-       wprintf("Content-length: %d\r\n\r\n", the_len);
-       client_write(the_data, the_len);
-       free(the_data);
-}
-
-
-
-/*
- * Read data from the client socket with default timeout.
- * (This is implemented in terms of client_read_to() and could be
- * justifiably moved out of sysdep.c)
- */
-int client_read(int sock, char *buf, int bytes)
-{
-       return (client_read_to(sock, buf, bytes, SLEEPING));
-}
 
 
 /*
- * client_gets()   ...   Get a LF-terminated line of text from the client.
- * (This is implemented in terms of client_read() and could be
- * justifiably moved out of sysdep.c)
+ * load redirect strings (for supporting transition of legacy web servers to citadel on the same host)
  */
-int client_gets(int sock, char *buf)
-{
-       int i, retval;
-
-       /* Read one character at a time.
-        */
-       for (i = 0;; i++) {
-               retval = client_read(sock, &buf[i], 1);
-               if (retval != 1 || buf[i] == '\n' || i == 255)
-                       break;
-       }
-
-       /* If we got a long line, discard characters until the newline.
-        */
-       if (i == 255)
-               while (buf[i] != '\n' && retval == 1)
-                       retval = client_read(sock, &buf[i], 1);
-
-       /*
-        * Strip any trailing non-printable characters.
-        */
-       buf[i] = 0;
-       while ((strlen(buf) > 0) && (!isprint(buf[strlen(buf) - 1]))) {
-               buf[strlen(buf) - 1] = 0;
+void load_redirs(char *filename) {
+       char buf[1024];
+       int num_redir_alloc = num_redir;
+       FILE *fp = fopen(filename, "r");
+       if (!fp) {
+               syslog(1, "Cannot open %s: %s", filename, strerror(errno));
+               return;
        }
-       return (retval);
-}
-
 
-/*
- * Start running as a daemon.  Only close stdio if do_close_stdio is set.
- */
-void start_daemon(int do_close_stdio)
-{
-       if (do_close_stdio) {
-               /* close(0); */
-               close(1);
-               close(2);
-       }
-       signal(SIGHUP, SIG_IGN);
-       signal(SIGINT, SIG_IGN);
-       signal(SIGQUIT, SIG_IGN);
-       if (fork() != 0)
-               exit(0);
-}
+       while (fgets(buf, sizeof buf, fp) != NULL) {
+               char *ch;
 
-void spawn_another_worker_thread() {
-       pthread_t SessThread;   /* Thread descriptor */
-       pthread_attr_t attr;    /* Thread attributes */
-       int ret;
+               buf[strlen(buf)-1] = 0;
 
-       lprintf(3, "Creating a new thread\n");
+               ch = strchr(buf, '#');
+               if (ch) strcpy(ch, "");
+               striplt(buf);
+               if (!IsEmptyStr(buf)) {
 
-       /* set attributes for the new thread */
-       pthread_attr_init(&attr);
-       pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+                       if (num_redir >= num_redir_alloc) {
+                               if (num_redir_alloc == 0) {
+                                       num_redir_alloc = 10;
+                               }
+                               else {
+                                       num_redir_alloc = num_redir_alloc * 2;
+                               }
+                               redir = realloc(redir, sizeof(struct redirector) * num_redir_alloc );
+                       }
+       
+                       extract_token(redir[num_redir].urlpart, buf, 0, '|', sizeof(redir[num_redir].urlpart));
+                       extract_token(redir[num_redir].redirect_to, buf, 1, '|', sizeof(redir[num_redir].redirect_to));
+                       WebcitAddUrlHandler(redir[num_redir].urlpart, strlen(redir[num_redir].urlpart), "", 0, handle_redir, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
+                       if (!strcasecmp(redir[num_redir].urlpart, "home")) {
+                               default_landing_page = redir[num_redir].redirect_to ;
+                       }
+                       ++num_redir;
+               }
 
-       /* Our per-thread stacks need to be bigger than the default size, otherwise
-        * the MIME parser crashes on FreeBSD, and the IMAP service crashes on
-        * 64-bit Linux.
-        */
-       if ((ret = pthread_attr_setstacksize(&attr, 1024 * 1024))) {
-               lprintf(1, "pthread_attr_setstacksize: %s\n", strerror(ret));
-               pthread_attr_destroy(&attr);
        }
+       fclose(fp);
+}
 
-       /* now create the thread */
-       if (pthread_create(&SessThread, &attr,
-                       (void *(*)(void *)) worker_entry, NULL)
-                  != 0) {
-               lprintf(1, "Can't create thread: %s\n",
-                       strerror(errno));
-       }
 
-       /* free up the attributes */
-       pthread_attr_destroy(&attr);
-}
 
 /*
  * Here's where it all begins.
  */
 int main(int argc, char **argv)
 {
-       pthread_t SessThread;   /* Thread descriptor */
-       pthread_attr_t attr;    /* Thread attributes */
-       int a, i;               /* General-purpose variables */
-       int port = PORT_NUM;    /* Port to listen on */
+       uid_t UID = -1;
+       size_t basesize = 2;            /* how big should strbufs be on creation? */
+       pthread_t SessThread;           /* Thread descriptor */
+       pthread_attr_t attr;            /* Thread attributes */
+       int a;                          /* General-purpose variable */
        char tracefile[PATH_MAX];
-       char ip_addr[256];
+       char ip_addr[256]="*";
+       int relh=0;
+       int home=0;
+       char relhome[PATH_MAX]="";
+       char webcitdir[PATH_MAX] = DATADIR;
+       char *pidfile = NULL;
+       char *hdir;
+       const char *basedir = NULL;
+       char uds_listen_path[PATH_MAX]; /* listen on a unix domain socket? */
+       const char *I18nDumpFile = NULL;
+       FILE *rvfp = NULL;
+       int rv = 0;
+
+       WildFireInitBacktrace(argv[0], 2);
+
+       start_modules ();
+
+#ifdef DBG_PRINNT_HOOKS_AT_START
+/*     dbg_PrintHash(HandlerHash, nix, NULL);*/
+#endif
+
+       /* Ensure that we are linked to the correct version of libcitadel */
+       if (libcitadel_version_number() < LIBCITADEL_VERSION_NUMBER) {
+               fprintf(stderr, " You are running libcitadel version %d.%02d\n",
+                       (libcitadel_version_number() / 100), (libcitadel_version_number() % 100));
+               fprintf(stderr, "WebCit was compiled against version %d.%02d\n",
+                       (LIBCITADEL_VERSION_NUMBER / 100), (LIBCITADEL_VERSION_NUMBER % 100));
+               return(1);
+       }
+
+       strcpy(uds_listen_path, "");
 
        /* Parse command line */
 #ifdef HAVE_OPENSSL
-       while ((a = getopt(argc, argv, "hi:p:t:cs")) != EOF)
+       while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:dD:G:r:cfsS:Z")) != EOF)
 #else
-       while ((a = getopt(argc, argv, "hi:p:t:c")) != EOF)
+       while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:dD:G:r:cfZ")) != EOF)
 #endif
                switch (a) {
+               case 'u':
+                       UID = atol(optarg);
+                       break;
+               case 'r':
+                       load_redirs(optarg);
+                       break;
+               case 'h':
+                       hdir = strdup(optarg);
+                       relh=hdir[0]!='/';
+                       if (!relh) {
+                               safestrncpy(webcitdir, hdir, sizeof webcitdir);
+                       }
+                       else {
+                               safestrncpy(relhome, relhome, sizeof relhome);
+                       }
+                       /* free(hdir); TODO: SHOULD WE DO THIS? */
+                       home=1;
+                       break;
+               case 'd':
+                       running_as_daemon = 1;
+                       break;
+               case 'D':
+                       pidfile = strdup(optarg);
+                       running_as_daemon = 1;
+                       break;
+               case 'B': /* Basesize */
+                       basesize = atoi(optarg);
+                       if (basesize > 2)
+                               StartLibCitadel(basesize);
+                       break;
                case 'i':
-                       strcpy(ip_addr, optarg);
+                       safestrncpy(ip_addr, optarg, sizeof ip_addr);
                        break;
                case 'p':
-                       port = atoi(optarg);
+                       http_port = atoi(optarg);
+                       if (http_port == 0) {
+                               safestrncpy(uds_listen_path, optarg, sizeof uds_listen_path);
+                       }
                        break;
                case 't':
-                       strcpy(tracefile, optarg);
-                       freopen(tracefile, "w", stdout);
-                       freopen(tracefile, "w", stderr);
-                       freopen(tracefile, "r", stdin);
+                       safestrncpy(tracefile, optarg, sizeof tracefile);
+                       rvfp = freopen(tracefile, "w", stdout);
+                       rvfp = freopen(tracefile, "w", stderr);
+                       rvfp = freopen(tracefile, "r", stdin);
+                       break;
+               case 'T':
+                       LoadTemplates = atoi(optarg);
+                       dbg_analyze_msg = (LoadTemplates && (1<<1)) != 0;
+                       dbg_backtrace_template_errors = (LoadTemplates && (1<<2)) != 0;
+                       break;
+               case 'Z':
+                       DisableGzip = 1;
                        break;
                case 'x':
                        verbosity = atoi(optarg);
                        break;
+               case 'f':
+                       follow_xff = 1;
+                       break;
                case 'c':
-                       server_cookie = malloc(SIZ);
+                       server_cookie = malloc(256);
                        if (server_cookie != NULL) {
-                               strcpy(server_cookie, "Set-cookie: wcserver=");
-                               if (gethostname(
-                                  &server_cookie[strlen(server_cookie)],
-                                  200) != 0) {
-                                       lprintf(2, "gethostname: %s\n",
-                                               strerror(errno));
+                               safestrncpy(server_cookie,
+                                      "Set-cookie: wcserver=",
+                                       256);
+                               if (gethostname
+                                   (&server_cookie[strlen(server_cookie)],
+                                    200) != 0) {
+                                       syslog(2, "gethostname: %s", strerror(errno));
                                        free(server_cookie);
                                }
                        }
                        break;
+#ifdef HAVE_OPENSSL
                case 's':
                        is_https = 1;
                        break;
+               case 'S':
+                       is_https = 1;
+                       ssl_cipher_list = strdup(optarg);
+                       break;
+#endif
+               case 'G':
+                       DumpTemplateI18NStrings = 1;
+                       I18nDump = NewStrBufPlain(HKEY("int templatestrings(void)\n{\n"));
+                       I18nDumpFile = optarg;
+                       break;
                default:
-                       fprintf(stderr, "usage: webserver "
+                       fprintf(stderr, "usage: webcit "
                                "[-i ip_addr] [-p http_port] "
-                               "[-t tracefile] [-c] "
+                               "[-t tracefile] [-c] [-f] "
+                               "[-T Templatedebuglevel] "
+                               "[-d] [-Z] [-G i18ndumpfile] "
 #ifdef HAVE_OPENSSL
-                               "[-s] "
+                               "[-s] [-S cipher_suites]"
 #endif
                                "[remotehost [remoteport]]\n");
                        return 1;
                }
 
+       /* Start the logger */
+       openlog("webcit",
+               ( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
+               LOG_DAEMON
+       );
+
        if (optind < argc) {
                ctdlhost = argv[optind];
                if (++optind < argc)
                        ctdlport = argv[optind];
        }
+
+       /* daemonize, if we were asked to */
+       if (!DumpTemplateI18NStrings && running_as_daemon) {
+               start_daemon(pidfile);
+       }
+       else {
+               signal(SIGINT, graceful_shutdown);
+               signal(SIGHUP, graceful_shutdown);
+       }
+
+       webcit_calc_dirs_n_files(relh, basedir, home, webcitdir, relhome);
+       LoadIconDir(static_icon_dir);
+
        /* Tell 'em who's in da house */
-       lprintf(1, SERVER "\n"
-"Copyright (C) 1996-2005 by the Citadel/UX development team.\n"
-"This software is distributed under the terms of the GNU General Public\n"
-"License.  If you paid for this software, someone is ripping you off.\n\n");
-
-       if (chdir(WEBCITDIR) != 0)
-               perror("chdir");
-
-        /*
-         * Set up a place to put thread-specific data.
-         * We only need a single pointer per thread - it points to the
-         * wcsession struct to which the thread is currently bound.
-         */
-        if (pthread_key_create(&MyConKey, NULL) != 0) {
-                lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
-        }
+       syslog(1, "%s", PACKAGE_STRING);
+       syslog(1, "Copyright (C) 1996-2011 by the citadel.org team");
+       syslog(1, " ");
+       syslog(1, "This program is open source software: you can redistribute it and/or");
+       syslog(1, "modify it under the terms of the GNU General Public License as published");
+       syslog(1, "by the Free Software Foundation, either version 3 of the License, or");
+       syslog(1, "(at your option) any later version.");
+       syslog(1, " ");
+       syslog(1, "This program is distributed in the hope that it will be useful,");
+       syslog(1, "but WITHOUT ANY WARRANTY; without even the implied warranty of");
+       syslog(1, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the");
+       syslog(1, "GNU General Public License for more details.");
+       syslog(1, " ");
+       syslog(1, "You should have received a copy of the GNU General Public License");
+       syslog(1, "along with this program.  If not, see <http://www.gnu.org/licenses/>.");
+       syslog(1, " ");
+
+
+       /* initialize various subsystems */
+
+       initialise_modules();
+       InitTemplateCache();
+       if (DumpTemplateI18NStrings) {
+               FILE *fd;
+               StrBufAppendBufPlain(I18nDump, HKEY("}\n"), 0);
+               if (StrLength(I18nDump) < 50) {
+                       syslog(1, "********************************************************************************\n");
+                       syslog(1, "*        No strings found in templates!  Are you sure they're there?           *\n");
+                       syslog(1, "********************************************************************************\n");
+                       return -1;
+               }
+               fd = fopen(I18nDumpFile, "w");
+               if (fd == NULL) {
+                       syslog(1, "********************************************************************************\n");
+                       syslog(1, "*                  unable to open I18N dumpfile [%s]         *\n", I18nDumpFile);
+                       syslog(1, "********************************************************************************\n");
+                       return -1;
+               }
+               rv = fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd);
+               fclose(fd);
+               return 0;
+       }
+
+
+       /* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */
+       icalerror_errors_are_fatal = 0;
+
+       /* Use our own prefix on tzid's generated from system tzdata */
+       icaltimezone_set_tzid_prefix("/citadel.org/");
+
+       /*
+        * Set up a place to put thread-specific data.
+        * We only need a single pointer per thread - it points to the
+        * wcsession struct to which the thread is currently bound.
+        */
+       if (pthread_key_create(&MyConKey, NULL) != 0) {
+               syslog(1, "Can't create TSD key: %s\n", strerror(errno));
+       }
+       InitialiseSemaphores ();
 
        /*
         * Set up a place to put thread-specific SSL data.
@@ -400,19 +383,32 @@ int main(int argc, char **argv)
         * transactions.
         */
 #ifdef HAVE_OPENSSL
-        if (pthread_key_create(&ThreadSSL, NULL) != 0) {
-                lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
-        }
+       if (pthread_key_create(&ThreadSSL, NULL) != 0) {
+               syslog(1, "Can't create TSD key: %s\n", strerror(errno));
+       }
 #endif
 
        /*
         * Bind the server to our favorite port.
-        * There is no need to check for errors, because ig_tcp_server()
+        * There is no need to check for errors, because webcit_tcp_server()
         * exits if it doesn't succeed.
         */
-       lprintf(2, "Attempting to bind to port %d...\n", port);
-       msock = ig_tcp_server(ip_addr, port, LISTEN_QUEUE_LENGTH);
-       lprintf(2, "Listening on socket %d\n", msock);
+
+       if (!IsEmptyStr(uds_listen_path)) {
+               syslog(2, "Attempting to create listener socket at %s...\n", uds_listen_path);
+               msock = webcit_uds_server(uds_listen_path, LISTEN_QUEUE_LENGTH);
+       }
+       else {
+               syslog(2, "Attempting to bind to port %d...\n", http_port);
+               msock = webcit_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH);
+       }
+       if (msock < 0)
+       {
+               ShutDownWebcit();
+               return -msock;
+       }
+
+       syslog(2, "Listening on socket %d\n", msock);
        signal(SIGPIPE, SIG_IGN);
 
        pthread_mutex_init(&SessionListMutex, NULL);
@@ -434,73 +430,17 @@ int main(int argc, char **argv)
                init_ssl();
        }
 #endif
+       drop_root(UID);
 
-       /* Start a few initial worker threads */
-       for (i=0; i<(MIN_WORKER_THREADS); ++i) {
-               spawn_another_worker_thread();
-       }
-
-       /* now the original thread becomes another worker */
+       /* Become a worker thread.  More worker threads will be spawned as they are needed. */
        worker_entry();
+       ShutDownLibCitadel();
        return 0;
 }
 
 
-/*
- * Entry point for worker threads
- */
-void worker_entry(void) {
-       int ssock;
-       int i = 0;
-       int time_to_die = 0;
-       int fail_this_transaction = 0;
-
-       do {
-               /* Only one thread can accept at a time */
-               fail_this_transaction = 0;
-               ssock = accept(msock, NULL, 0);
-               if (ssock < 0) {
-                       lprintf(2, "accept() failed: %s\n", strerror(errno));
-               } else {
-                       /* Set the SO_REUSEADDR socket option */
-                       i = 1;
-                       setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR,
-                               &i, sizeof(i));
-
-                       /* If we are an HTTPS server, go crypto now. */
-#ifdef HAVE_OPENSSL
-                       if (is_https) {
-                               if (starttls(ssock) != 0) {
-                                       fail_this_transaction = 1;
-                                       close(ssock);
-                               }
-                       }
-#endif
 
-                       if (fail_this_transaction == 0) {
-                               /* Perform an HTTP transaction... */
-                               context_loop(ssock);
-                               /* ...and close the socket. */
-                               lingering_close(ssock);
-                       }
 
-               }
 
-       } while (!time_to_die);
-
-       pthread_exit(NULL);
-}
 
 
-int lprintf(int loglevel, const char *format, ...)
-{
-       va_list ap;
-
-       if (loglevel <= verbosity) {
-               va_start(ap, format);
-               vfprintf(stderr, format, ap);
-               va_end(ap);
-               fflush(stderr);
-       }
-       return 1;
-}