Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

diff --git a/citadel/modules/ctdlproto/serv_user.c b/citadel/modules/ctdlproto/serv_user.c
index 5a7162977c717e91f5a2decbffa3d77d420c4670..e98daad9fa9e26f6d9e8f3ff79b61362a1f80c76 100644 (file)
--- a/citadel/modules/ctdlproto/serv_user.c
+++ b/citadel/modules/ctdlproto/serv_user.c
@@ -119,6 +119,7 @@ void cmd_newu(char *cmdbuf)
                cprintf("%d %s: Too many users are already online (maximum is %d)\n",
                        ERROR + MAX_SESSIONS_EXCEEDED,
                        config.c_nodename, config.c_maxsessions);
+               return;
        }
        extract_token(username, cmdbuf, 0, '|', sizeof username);
        strproc(username);

diff --git a/libcitadel/lib/b64/cencode.c b/libcitadel/lib/b64/cencode.c
index e440f378437f08b31e91953d3147d8855bdf99b6..64720f6cf678a149e93cf659f853680d410b7bd2 100644 (file)
--- a/libcitadel/lib/b64/cencode.c
+++ b/libcitadel/lib/b64/cencode.c
@@ -92,6 +92,7 @@ int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
        case step_A:
                break;
        }
+       *codechar++ = '\r';
        *codechar++ = '\n';
        
        return codechar - code_out;

diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index bc0cb767b3cbaa613723452761453117f0cf84f2..ff35f9ecae04b9e7408cf9322bb17848fca7216d 100644 (file)
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -320,10 +320,6 @@ size_t CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen, int li
 
                t = destoffset;
                destoffset += base64_encode_blockend(&(dest[destoffset]), &_state);
-               if (t < destoffset) {
-                       dest[destoffset++] = '\r';
-                       dest[destoffset++] = '\n';
-               }
        }
        else {
                destoffset = base64_encode_block(source, sourcelen, dest, &_state);