*-login: Change login_set_roots earlier.

--HG--
branch : HEAD

diff --git a/src/imap-login/client.c b/src/imap-login/client.c
index 73270f47352e62a81419c2b5251e522e45f86e8f..5ce34a157ab84c82917da11cfbf70b23df241463 100644 (file)
--- a/src/imap-login/client.c
+++ b/src/imap-login/client.c
@@ -34,6 +34,7 @@ unsigned int login_default_port = 143;
 
 void login_process_preinit(void)
 {
+       login_set_roots = imap_login_setting_roots;
 }
 
 /* Skip incoming data until newline is found,
@@ -425,7 +426,6 @@ imap_client_send_line(struct client *client, enum client_cmd_reply reply,
 
 void clients_init(void)
 {
-       login_set_roots = imap_login_setting_roots;
 }
 
 void clients_deinit(void)

diff --git a/src/pop3-login/client.c b/src/pop3-login/client.c
index ed43c562ccb17e8f7ea43b719afc13b2e1db6204..11f554620c4a844b5bef562613011f608ff7c402 100644 (file)
--- a/src/pop3-login/client.c
+++ b/src/pop3-login/client.c
@@ -28,6 +28,7 @@ unsigned int login_default_port = 110;
 
 void login_process_preinit(void)
 {
+       login_set_roots = pop3_login_setting_roots;
 }
 
 static bool cmd_stls(struct pop3_client *client)
@@ -217,7 +218,6 @@ static void pop3_login_die(void)
 
 void clients_init(void)
 {
-       login_set_roots = pop3_login_setting_roots;
        /* override the default login_die() */
        master_service_set_die_callback(master_service, pop3_login_die);
 }