From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 5 Apr 2016 17:10:53 +0000 (+0300)
Subject: lib-storage: Changed separator between session_id_prefix and unique part to be ':'
X-Git-Tag: 2.2.24~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6cb874b7e9239922e509fc91c0567cd266904a4c;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Changed separator between session_id_prefix and unique part to be ':'

Although '-' wasn't used by default either, it's much more likely that
custom session IDs might contain it. ':' is hopefully less likely to be used.
This allows log parsers that actually want to find out the original session's
all log lines to cut out everything after the initial ':'.
---

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 8aa86f3698..babdab9804 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1102,7 +1102,7 @@ mail_storage_service_generate_session_id(pool_t pool, const char *prefix)
 	string_t *str = str_new(pool, MAX_BASE64_ENCODED_SIZE(prefix_len + 1 + sizeof(guid)));
 
 	if (prefix != NULL)
-		str_printfa(str, "%s-", prefix);
+		str_printfa(str, "%s:", prefix);
 
 	guid_128_generate(guid);
 	base64_encode(guid, sizeof(guid), str);