HUGE PATCH. This moves all of mime_parser.c and all

[citadel.git] / citadel / setup.c

diff --git a/citadel/setup.c b/citadel/setup.c
index 3dff70e1af0e4ec8d7853e2208b396c45ce88adf..f0ad438a376009f5248b489c1c49a28966bb19d0 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -21,12 +21,11 @@
 #include <limits.h>
 #include <pwd.h>
 #include <time.h>
-
+#include <libcitadel.h>
 #include "citadel.h"
 #include "axdefs.h"
 #include "sysdep.h"
 #include "config.h"
-#include "tools.h"
 #include "citadel_dirs.h"
 
 #define MAXSETUP 5     /* How many setup questions to ask */
@@ -1005,7 +1004,7 @@ int main(int argc, char *argv[])
                safestrncpy(relhome, ctdl_home_directory, sizeof relhome);
        }
 
-       calc_dirs_n_files(relh, home, relhome, ctdldir);
+       calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
        
        enable_home=(relh|home);
 
@@ -1251,7 +1250,6 @@ NEW_INST:
        disable_other_mta("dovecot");
        disable_other_mta("exim");
        disable_other_mta("exim4");
-       disable_other_mta("hula");
        disable_other_mta("imapd");
        disable_other_mta("mta");
        disable_other_mta("pop3d");
@@ -1261,7 +1259,6 @@ NEW_INST:
        disable_other_mta("saslauthd");
        disable_other_mta("sendmail");
        disable_other_mta("vmailmgrd");
-       disable_other_mta("zimbra");
 #endif
 
        /* Check for the 'db' nss and offer to disable it */