X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/a1caa6da6f72e8c5b8b24678e32c4953a26a2b48..HEAD:/src/src/exim.c

diff --git a/src/src/exim.c b/src/src/exim.c
index 3170bef98..b78839b57 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1108,6 +1108,9 @@ g = string_cat(g, US"Support for:");
 #ifndef DISABLE_ESMTP_LIMITS
   g = string_cat(g, US" ESMTP_Limits");
 #endif
+#ifndef DISABLE_WELLKNOWN
+  g = string_cat(g, US" ESMTP_Wellknown");
+#endif
 #ifndef DISABLE_EVENT
   g = string_cat(g, US" Event");
 #endif
@@ -2339,9 +2342,9 @@ on the second character (the one after '-'), to save some effort. */
 
 	/* -bh: Host checking - an IP address must follow. */
 	case 'h':
-	  if (!*argrest || Ustrcmp(argrest, "c") == 0)
+	  if (  (!*argrest || Ustrcmp(argrest, "c") == 0)
+	     && ++i < argc)
 	    {
-	    if (++i >= argc) { badarg = TRUE; break; }
 	    sender_host_address = string_copy_taint(
 		  exim_str_fail_toolong(argv[i], EXIM_IPADDR_MAX, "-bh"),
 		  GET_TAINTED);
@@ -2349,7 +2352,8 @@ on the second character (the one after '-'), to save some effort. */
 	    f.host_checking_callout = *argrest == 'c';
 	    message_logs = FALSE;
 	    }
-	  else badarg = TRUE;
+	  else
+	    badarg = TRUE;
 	  break;
 
 	/* -bi: This option is used by sendmail to initialize *the* alias file,
@@ -2632,14 +2636,11 @@ on the second character (the one after '-'), to save some effort. */
               reset_point = store_mark();
               while (Ufgets(big_buffer, big_buffer_size, trust_list))
                 {
-                uschar *start = big_buffer, *nl;
-                while (*start && isspace(*start))
-                start++;
-                if (*start != '/')
+                uschar * start = big_buffer, * nl;
+                if (Uskip_whitespace(&start) != '/')
                   continue;
-                nl = Ustrchr(start, '\n');
-                if (nl)
-                  *nl = 0;
+                if ((nl = Ustrchr(start, '\n')))
+                  *nl = '\0';
                 trusted_configs[nr_configs++] = string_copy(start);
                 if (nr_configs == nelem(trusted_configs))
                   break;
@@ -2698,7 +2699,7 @@ on the second character (the one after '-'), to save some effort. */
       const uschar * s = argrest;
 
       opt_D_used = TRUE;
-      while (isspace(*s)) s++;
+      Uskip_whitespace(&s);
 
       if (*s < 'A' || *s > 'Z')
         exim_fail("exim: macro name set by -D must start with "
@@ -2711,11 +2712,10 @@ on the second character (the one after '-'), to save some effort. */
         }
       name[ptr] = 0;
       if (ptr == 0) { badarg = TRUE; break; }
-      while (isspace(*s)) s++;
-      if (*s != 0)
+      if (Uskip_whitespace(&s))
         {
         if (*s++ != '=') { badarg = TRUE; break; }
-        while (isspace(*s)) s++;
+        Uskip_whitespace(&s);
         }
 
       for (m = macros_user; m; m = m->next)
@@ -5447,11 +5447,14 @@ if (host_checking)
     }
 
   /* In case the given address is a non-canonical IPv6 address, canonicalize
-  it. The code works for both IPv4 and IPv6, as it happens. */
+  it. Use the compressed form for IPv6. */
 
   size = host_aton(sender_host_address, x);
   sender_host_address = store_get(48, GET_UNTAINTED);  /* large enough for full IPv6 */
-  (void)host_nmtoa(size, x, -1, sender_host_address, ':');
+  if (size == 1)
+    (void) host_nmtoa(size, x, -1, sender_host_address, ':');
+  else
+    (void) ipv6_nmtoa(x, sender_host_address);
 
   /* Now set up for testing */
 
@@ -5918,7 +5921,7 @@ for (BOOL more = TRUE; more; )
         receive_add_recipient(string_copy_taint(recipient, GET_TAINTED), -1);
         s = ss;
         if (!finished)
-          while (*(++s) != 0 && (*s == ',' || isspace(*s)));
+          while (*++s && (*s == ',' || isspace(*s)));
         }
       }
 
@@ -6193,3 +6196,5 @@ return 0;                  /* To stop compiler warning */
 
 
 /* End of exim.c */
+/* vi: aw ai sw=2
+*/