--- amavisd-milter/mlfi.c	22 Apr 2013 00:36:12 -0000	1.60
+++ amavisd-milter/mlfi.c	13 Jan 2015 17:00:47 -0000
@@ -695,14 +695,14 @@
     l = 0;
     *mlfi->mlfi_amabuf = '\0';
     if ((policybank_from_daemon_name == 1) && (mlfi->mlfi_daemon_name != NULL)) {
-	l += snprintfcat(0, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
+	l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
 	    "%s", mlfi->mlfi_daemon_name);
     }
     if (auth_type != NULL) {
 	if (l > 0) {
-	    l += snprintfcat(0, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length, ",");
+	    l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length, ",");
 	}
-	l += snprintfcat(0, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
+	l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,
 	    "SMTP_AUTH,SMTP_AUTH_%s", auth_type);
 	if (auth_ssf != NULL && *auth_ssf != '\0') {
 	    l += snprintfcat(l, mlfi->mlfi_amabuf, mlfi->mlfi_amabuf_length,