+2011-05-12 [colin] 3.7.9cvs22
+
+ * src/common/utils.c
+ Fix bug #2412, "Send account mail address in Message-ID
+ wrongly implemented". Patch by Fabian Keil.
+
2011-05-12 [mones] 3.7.9cvs21
* src/etpan/nntp-thread.c
( cvs diff -u -r 1.179.2.254 -r 1.179.2.255 src/imap.c; cvs diff -u -r 1.149.2.103 -r 1.149.2.104 src/inc.c; cvs diff -u -r 1.101.2.64 -r 1.101.2.65 src/news.c; cvs diff -u -r 1.17.2.59 -r 1.17.2.60 src/send_message.c; ) > 3.7.9cvs19.patchset
( cvs diff -u -r 1.274.2.323 -r 1.274.2.324 src/mainwindow.c; cvs diff -u -r 1.52.2.82 -r 1.52.2.83 src/prefs_folder_item.c; ) > 3.7.9cvs20.patchset
( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/etpan/nntp-thread.c; ) > 3.7.9cvs21.patchset
+( cvs diff -u -r 1.36.2.192 -r 1.36.2.193 src/common/utils.c; ) > 3.7.9cvs22.patchset
t = time(NULL);
lt = localtime_r(&t, &buft);
- if (strcmp(buf, "") == 0) {
- if (user_addr != NULL)
- addr = g_strconcat(".", user_addr, "@", get_domain_name(), NULL);
- else
- addr = g_strconcat("@", get_domain_name(), NULL);
- } else {
- if (user_addr != NULL)
- addr = g_strconcat(".", user_addr, "@", buf, NULL);
- else
- addr = g_strconcat("@", buf, NULL);
- }
+ if (user_addr != NULL)
+ addr = g_strdup_printf(".%s", user_addr);
+ else if (strlen(buf) != 0)
+ addr = g_strdup_printf("@%s", buf);
+ else
+ addr = g_strdup_printf("@%s", get_domain_name());
/* Replace all @ but the last one in addr, with underscores.
* RFC 2822 States that msg-id syntax only allows one @.