Index: files/patch-ssmtp.c =================================================================== --- files/patch-ssmtp.c (revision 408698) +++ files/patch-ssmtp.c (working copy) @@ -227,12 +227,20 @@ } header_save(p); -@@ -876,11 +900,11 @@ +@@ -876,12 +900,18 @@ + char *begin=buf; char *rightside; /* Make comments invisible */ - if((p = strchr(buf, '#'))) { +- if((p = strchr(buf, '#'))) { - *p = (char)NULL; -+ *p = '\0'; ++ if((p = strchr(buf, '#'))) { ++ /* check if # is a part of a param */ ++ if((q = strchr(buf, '='))) { ++ if ((int)(p-buf) < (int)(q-buf)) ++ *p = '\0'; ++ } ++ else ++ *p = '\0'; } /* Ignore malformed lines and comments */