X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fverify.c;h=6e07566a7edc78fa0611b02c1cf422cffbc983f7;hb=fa41c9c28f8445d5d7c61dddf5008707382bc810;hp=07e663536268b3d8f70b4c005bd1d7c172a74897;hpb=dcc5e2cbb4a253eea54c12320e54fb5d85d64e5f;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/verify.c b/src/src/verify.c
index 07e663536..6e07566a7 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1685,7 +1685,8 @@ if (parse_find_at(address) == NULL)
     *failure_ptr = US"qualify";
     return FAIL;
     }
-  address = rewrite_address_qualify(address, options & vopt_is_recipient);
+  /* deconst ok as address was not const */
+  address = US rewrite_address_qualify(address, options & vopt_is_recipient);
   }
 
 DEBUG(D_verify)
@@ -1700,7 +1701,8 @@ may have been set by domains and local part tests during an ACL. */
 if (global_rewrite_rules)
   {
   uschar *old = address;
-  address = rewrite_address(address, options & vopt_is_recipient, FALSE,
+  /* deconst ok as address was not const */
+  address = US rewrite_address(address, options & vopt_is_recipient, FALSE,
     global_rewrite_rules, rewrite_existflags);
   if (address != old)
     {
@@ -3388,8 +3390,8 @@ if ((rc = verify_address(&vaddr, NULL, vopt_is_recipient | vopt_quota,
 
   len = 5 + Ustrlen(msg) + 1 + Ustrlen(where);
   msg = string_sprintf("%c%c%c%c%c%s%c%s", (uschar)rc,
-    (vaddr.basic_errno >> 24) && 0xff, (vaddr.basic_errno >> 16) && 0xff,
-    (vaddr.basic_errno >> 8) && 0xff, vaddr.basic_errno && 0xff,
+    (vaddr.basic_errno >> 24) & 0xff, (vaddr.basic_errno >> 16) & 0xff,
+    (vaddr.basic_errno >> 8) & 0xff, vaddr.basic_errno & 0xff,
     where, '\0', msg);
   }