more places to fix the new linebreak behaviour of the base64 encoder.

[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 fe7b5423978e13c45b53833a1fe97bf2c8bd9f54..23f5f263c614b67b8db4ea489c3ff841bc33fae8 100644 (file)
--- a/citadel/modules/managesieve/serv_managesieve.c
+++ b/citadel/modules/managesieve/serv_managesieve.c
@@ -8,19 +8,13 @@
  *
  * Copyright (c) 2007-2012 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.
- *  
- *  
+ * 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.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  
- *  
- *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
@@ -68,17 +62,11 @@
 #include "clientsocket.h"
 #include "locate_host.h"
 #include "citadel_dirs.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
-
 #include "ctdl_module.h"
 #include "serv_sieve.h"
 
 
-/**
+/*
  * http://tools.ietf.org/html/draft-martin-managesieve-06
  *
  * this is the draft this code tries to implement.
@@ -288,10 +276,10 @@ void cmd_mgsve_auth(int num_parms, char **parms, struct sdm_userdata *u)
                        message = ReadString(GetSizeToken(parms[2]), parms[0]);
                
                if (message != NULL) {/**< do we have tokenized login? */
-                       CtdlDecodeBase64(auth, MGSVE->transmitted_message, SIZ);
+                       CtdlDecodeBase64(auth, MGSVE->transmitted_message, strlen(MGSVE->transmitted_message));
                }
                else 
-                       CtdlDecodeBase64(auth, parms[2], SIZ);
+                       CtdlDecodeBase64(auth, parms[2], strlen(parms[2]));
                username = auth;
                if ((*username == '\0') && (*(username + 1) != '\0'))
                        username ++;
@@ -519,7 +507,10 @@ void mgsve_auth(char *argbuf) {
                if (strlen(argbuf) >= 7) {
                }
                else {
-                       CtdlEncodeBase64(username_prompt, "Username:", 9, 0);
+                       size_t len = CtdlEncodeBase64(username_prompt, "Username:", 9, 0);
+                       if (username_prompt[len - 1] == '\n') {
+                               username_prompt[len - 1] = '\0';
+                       }
                        cprintf("334 %s\r\n", username_prompt);
                }
                return;
@@ -666,7 +657,7 @@ CTDL_MODULE_INIT(managesieve)
                                        managesieve_command_loop,
                                        NULL, 
                                        CitadelServiceManageSieve);
-               CtdlRegisterSessionHook(managesieve_cleanup_function, EVT_STOP);
+               CtdlRegisterSessionHook(managesieve_cleanup_function, EVT_STOP, PRIO_STOP + 30);
        }
        
        /* return our module name for the log */