Fix lots of warnings all over the place, make inbound buffers of FMOUT const.

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 6e3aef7ac746f95347b9f340f0903145a781149e..603265eca352f4605b881b092b8cec54c760eb19 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -22,9 +22,9 @@ 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 */
 int follow_xff = 0;            /* Follow X-Forwarded-For: header */
-int home_specified = 0;                /* did the user specify a homedir? */
 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;
@@ -36,7 +36,7 @@ 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 */
@@ -131,6 +131,9 @@ void load_redirs(char *filename) {
                        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;
                }
 
@@ -154,7 +157,6 @@ int main(int argc, char **argv)
        char ip_addr[256]="*";
        int relh=0;
        int home=0;
-       int home_specified=0;
        char relhome[PATH_MAX]="";
        char webcitdir[PATH_MAX] = DATADIR;
        char *pidfile = NULL;
@@ -207,7 +209,6 @@ int main(int argc, char **argv)
                                safestrncpy(relhome, relhome, sizeof relhome);
                        }
                        /* free(hdir); TODO: SHOULD WE DO THIS? */
-                       home_specified = 1;
                        home=1;
                        break;
                case 'd':