From: Art Cancro <ajc@uncensored.citadel.org>
Date: Sat, 18 Apr 2015 23:27:00 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: Release_902~168^2~1
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=98ac706cc21d0f46f4f49d8343a12a6993c836de;hp=c9a4516b2eb2b24c87322b78bae790f24cc7a0a6;p=citadel.git

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 5a7162977..e98daad9f 100644
--- 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 e440f3784..64720f6cf 100644
--- 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 bc0cb767b..ff35f9eca 100644
--- 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);