* citmail.c: changes to citmail to make it usable as a /usr/sbin/sendmail

[citadel.git] / citadel / serv_smtp.c

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index c628aa4d98f134a7df764b3f0f7accadfdf9e3a2..6c46264e9c8c6b1065b591a93cee2e02a7cfbbf1 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -519,7 +519,9 @@ void smtp_mail(char *argbuf) {
 
        strcpy(SMTP->from, &argbuf[5]);
        striplt(SMTP->from);
-       stripallbut(SMTP->from, '<', '>');
+       if (haschar(SMTP->from, '<') > 0) {
+               stripallbut(SMTP->from, '<', '>');
+       }
 
        /* We used to reject empty sender names, until it was brought to our
         * attention that RFC1123 5.2.9 requires that this be allowed.  So now