Removed the 'master user' feature ... if we still need this we'll find another way

[citadel.git] / citadel / modules / managesieve / serv_managesieve.c

diff --git a/citadel/modules/managesieve/serv_managesieve.c b/citadel/modules/managesieve/serv_managesieve.c
index 23f5f263c614b67b8db4ea489c3ff841bc33fae8..e085d5991a1691a7988e8df2f4c3f2c8afbef794 100644 (file)
--- a/citadel/modules/managesieve/serv_managesieve.c
+++ b/citadel/modules/managesieve/serv_managesieve.c
@@ -6,7 +6,7 @@
  * as this draft expires with this writing, you might need to search for
  * the new one.
  *
- * Copyright (c) 2007-2012 by the citadel.org team
+ * Copyright (c) 2007-2018 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -284,7 +284,7 @@ void cmd_mgsve_auth(int num_parms, char **parms, struct sdm_userdata *u)
                if ((*username == '\0') && (*(username + 1) != '\0'))
                        username ++;
                
-               if (login_ok == CtdlLoginExistingUser(NULL, username))
+               if (login_ok == CtdlLoginExistingUser(username))
                {
                        char *pass;
 
@@ -651,7 +651,7 @@ CTDL_MODULE_INIT(managesieve)
 {
        if (!threading)
        {
-               CtdlRegisterServiceHook(config.c_managesieve_port,
+               CtdlRegisterServiceHook(CtdlGetConfigInt("c_managesieve_port"),
                                        NULL,
                                        managesieve_greeting,
                                        managesieve_command_loop,