Avoid trailing whitespace in MAIL FROM line (Lukas Fleischer)

diff --git a/src/mail-functions.c b/src/mail-functions.c
index 8a0e49fd59509dbff762a273d86fc2f9e1494a7f..724d2ffdbea2adca7b122f016704f9149f8d4c73 100644 (file)
--- a/src/mail-functions.c
+++ b/src/mail-functions.c
@@ -61,7 +61,7 @@ int write_helo(int sockfd, const char *hostname)
        myfree(helo);
        return 0;
 }
-/* "MAIL FROM: <>\r\n" has length 15 */
+/* "MAIL FROM: <> \r\n" has length 16 */
 #define EXTRA_FROM_LEN 16
 int write_mail_from(int sockfd, const char *from_addr, const char *extra)
 {
@@ -72,12 +72,12 @@ int write_mail_from(int sockfd, const char *from_addr, const char *extra)
 
        mail_from = mymalloc(len);
 
-       if(extra && extra[0] == ' ')
-               snprintf(mail_from, len, "MAIL FROM: <%s>%s\r\n", from_addr,
-                               extra);
-       else
+       if(extra && extra[0] != '\0') {
+               if(extra[0] == ' ') extra++;
                snprintf(mail_from, len, "MAIL FROM: <%s> %s\r\n", from_addr,
                                extra);
+       } else
+               snprintf(mail_from, len, "MAIL FROM: <%s>\r\n", from_addr);
 
        len = strlen(mail_from);