X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ae8f9024d8d4fad31457d758022e3186d782929c..9fa3eec7bb2e6a14a0b62dbc713c0ba5b2b5cd34:/src/src/expand.c?ds=inline

diff --git a/src/src/expand.c b/src/src/expand.c
index ca7d36838..f32425b3f 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -1687,7 +1687,7 @@ else
   return g;
 
 if (sender_host_address)
-  g = string_append(g, 2, US" smtp.client-ip=", sender_host_address);
+  g = string_append(g, 2, US" smtp.remote-ip=", sender_host_address);
 return g;
 }
 
@@ -5811,7 +5811,7 @@ while (*s != 0)
 		}
 	      if (Ustrcmp(item, sub[0]) == 0)	/*XXX should be a UTF8-compare */
 		{
-		s = item + strlen(item) + 1;
+		s = item + Ustrlen(item) + 1;
 		while (isspace(*s)) s++;
 		if (*s != ':')
 		  {