X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Fsmtp_in.c;h=1b7df5c30a5b2e5cf39b52fedd3b5b032277b8bb;hp=dea776dcc55bfca8007cf7dee3e3bd4dcf430be9;hb=dfbcb5ac660065b097b0ad0cb2c26357899f0c64;hpb=2d0dc9298e36bb9c010ede2c42db16e3ab00da79

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index dea776dcc..1b7df5c30 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -4095,7 +4095,11 @@ while (done <= 0)
 		&user_msg, &log_msg)) != OK)
         {
         done = smtp_handle_acl_fail(ACL_WHERE_HELO, rc, user_msg, log_msg);
-        sender_helo_name = NULL;
+	if (sender_helo_name)
+	  {
+	  store_free(sender_helo_name);
+	  sender_helo_name = NULL;
+	  }
         host_build_sender_fullhost();  /* Rebuild */
         break;
         }
@@ -5739,6 +5743,23 @@ while (done <= 0)
 return done - 2;  /* Convert yield values */
 }
 
+
+
+gstring *
+authres_smtpauth(gstring * g)
+{
+if (!sender_host_authenticated)
+  return g;
+
+g = string_append(g, 4, US";\\n\\tauth=pass"
+	" (", sender_host_authenticated, US") smtp.auth=", authenticated_id);
+if (authenticated_sender)
+  g = string_append(g, 2, US" smtp.mailfrom=", authenticated_sender);
+return g;
+}
+
+
+
 /* vi: aw ai sw=2
 */
 /* End of smtp_in.c */