X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Flistsub%2Fserv_listsub.c;h=ada4bbadd64e2323be4d29a903020104f4d87cbe;hb=3ea9847837af221d22494eebeb8b08826db0fb25;hp=a9fd95bfb8761a8706c2fc1af3f644fa55e5f761;hpb=45b78922f2a32508de0632e2ca8c922b46d96850;p=citadel.git

diff --git a/citadel/modules/listsub/serv_listsub.c b/citadel/modules/listsub/serv_listsub.c
index a9fd95bfb..ada4bbadd 100644
--- a/citadel/modules/listsub/serv_listsub.c
+++ b/citadel/modules/listsub/serv_listsub.c
@@ -48,7 +48,6 @@
 #include "msgbase.h"
 #include "internet_addressing.h"
 #include "clientsocket.h"
-#include "file_ops.h"
 #include "ctdl_module.h"
 
 /*
@@ -58,17 +57,21 @@
 void listsub_generate_token(char *buf) {
 	char sourcebuf[SIZ];
 	static int seq = 0;
+	size_t len;
 
 	/* Theo, please sit down and shut up.  This key doesn't have to be
 	 * tinfoil-hat secure, it just needs to be reasonably unguessable
 	 * and unique.
 	 */
-	sprintf(sourcebuf, "%lx",
+	len = sprintf(sourcebuf, "%lx",
 		(long) (++seq + getpid() + time(NULL))
 	);
 
 	/* Convert it to base64 so it looks cool */	
-	CtdlEncodeBase64(buf, sourcebuf, strlen(sourcebuf), 0);
+	len = CtdlEncodeBase64(buf, sourcebuf, len, 0);
+	if (buf[len - 1] == '\n') {
+		buf[len - 1] = '\0';
+	}
 }
 
 const RoomNetCfg ActiveSubscribers[] = {listrecp, digestrecp};