X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/8768d5483a5894400ae1f70cda1beb44ed9b087c..d12746bc15d83ab821be36975da0179672708bc1:/src/src/acl.c

diff --git a/src/src/acl.c b/src/src/acl.c
index d4d370f5e..f3b860e4a 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -2165,8 +2165,6 @@ Arguments:
   log_msgptr  for error messages
   format      format string
   ...         supplementary arguments
-  ss          ratelimit option name
-  where       ACL_WHERE_xxxx indicating which ACL this is
 
 Returns:      ERROR
 */
@@ -2175,14 +2173,15 @@ static int
 ratelimit_error(uschar **log_msgptr, const char *format, ...)
 {
 va_list ap;
-uschar buffer[STRING_SPRINTF_BUFFER_SIZE];
+gstring * g =
+  string_cat(NULL, US"error in arguments to \"ratelimit\" condition: ");
+
 va_start(ap, format);
-if (!string_vformat(buffer, sizeof(buffer), format, ap))
-  log_write(0, LOG_MAIN|LOG_PANIC_DIE,
-    "string_sprintf expansion was longer than " SIZE_T_FMT, sizeof(buffer));
+g = string_vformat(g, TRUE, format, ap);
 va_end(ap);
-*log_msgptr = string_sprintf(
-  "error in arguments to \"ratelimit\" condition: %s", buffer);
+
+gstring_reset_unused(g);
+*log_msgptr = string_from_gstring(g);
 return ERROR;
 }
 
@@ -3404,7 +3403,7 @@ for (; cb; cb = cb->next)
 
         else
           {
-          if (smtp_out != NULL && !f.disable_delay_flush)
+          if (smtp_out && !f.disable_delay_flush)
 	    mac_smtp_fflush();
 
 #if !defined(NO_POLL_H) && defined (POLLRDHUP)
@@ -3421,16 +3420,16 @@ for (; cb; cb = cb->next)
 	      HDEBUG(D_acl) debug_printf_indent("delay cancelled by peer close\n");
 	    }
 #else
-        /* It appears to be impossible to detect that a TCP/IP connection has
-        gone away without reading from it. This means that we cannot shorten
-        the delay below if the client goes away, because we cannot discover
-        that the client has closed its end of the connection. (The connection
-        is actually in a half-closed state, waiting for the server to close its
-        end.) It would be nice to be able to detect this state, so that the
-        Exim process is not held up unnecessarily. However, it seems that we
-        can't. The poll() function does not do the right thing, and in any case
-        it is not always available.
-        */
+	  /* Lacking POLLRDHUP it appears to be impossible to detect that a
+	  TCP/IP connection has gone away without reading from it. This means
+	  that we cannot shorten the delay below if the client goes away,
+	  because we cannot discover that the client has closed its end of the
+	  connection. (The connection is actually in a half-closed state,
+	  waiting for the server to close its end.) It would be nice to be able
+	  to detect this state, so that the Exim process is not held up
+	  unnecessarily. However, it seems that we can't. The poll() function
+	  does not do the right thing, and in any case it is not always
+	  available.  */
 
           while (delay > 0) delay = sleep(delay);
 #endif
@@ -3566,7 +3565,6 @@ for (; cb; cb = cb->next)
         }
       while (isspace(*s)) s++;
 
-
       if (logbits == 0) logbits = LOG_MAIN;
       log_write(0, logbits, "%s", string_printing(s));
       }