LDAP: fix taint-check in server list walk. Bug 2646

[exim.git] / src / src / smtp_in.c

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 69eae3cb4bd1016307f9fa577d5f469a0e2bebcf..cf6271c6033c2510821bacd2b26299ab10c36f39 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -1219,7 +1219,7 @@ socklen_t vslen = sizeof(struct timeval);
 BOOL yield = FALSE;
 
 os_non_restarting_signal(SIGALRM, command_timeout_handler);
-ALARM(PROXY_NEGOTIATION_TIMEOUT_SEC);
+ALARM(proxy_protocol_timeout);
 
 do
   {
@@ -5899,7 +5899,7 @@ if (Ustrcmp(sender_host_auth_pubname, "tls") != 0)
 else if (authenticated_id)
   g = string_append(g, 2, US") x509.auth=", authenticated_id);
 else
-  g = string_catn(g, US") reason=x509.auth", 17);
+  g = string_cat(g, US") reason=x509.auth");
 
 if (authenticated_sender)
   g = string_append(g, 2, US" smtp.mailfrom=", authenticated_sender);