Prepared some of the authmode stuff for the imminent addition

[citadel.git] / citadel / setup.c

diff --git a/citadel/setup.c b/citadel/setup.c
index f0ad438a376009f5248b489c1c49a28966bb19d0..fc64eb78e0586e1c998bc9075dc2a4a1100c5324 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -785,10 +785,10 @@ void edit_value(int curr)
                {
                        if (getenv("ENABLE_UNIX_AUTH")) {
                                if (!strcasecmp(getenv("ENABLE_UNIX_AUTH"), "yes")) {
-                                       config.c_auth_mode = 1;
+                                       config.c_auth_mode = AUTHMODE_HOST;
                                }
                                else {
-                                       config.c_auth_mode = 0;
+                                       config.c_auth_mode = AUTHMODE_NATIVE;
                                }
                        }
                }
@@ -1158,6 +1158,8 @@ int main(int argc, char *argv[])
        if (config.c_imaps_port == 0) config.c_imaps_port = 993;
        if (config.c_pftcpdict_port == 0) config.c_pftcpdict_port = -1;
        if (config.c_managesieve_port == 0) config.c_managesieve_port = 2020;
+       if (config.c_xmpp_c2s_port == 0) config.c_xmpp_c2s_port = 5222;
+       if (config.c_xmpp_s2s_port == 0) config.c_xmpp_s2s_port = 5269;
 
        /* Go through a series of dialogs prompting for config info */
        for (curr = 1; curr <= MAXSETUP; ++curr) {