tidying: coverity issues

[exim.git] / src / src / routers / redirect.c

diff --git a/src/src/routers/redirect.c b/src/src/routers/redirect.c
index 371377317da9e8ab20100e36dc8c73fa56a0bec0..2efb42160d3318755b35a79ae1f390a228aede14 100644 (file)
--- a/src/src/routers/redirect.c
+++ b/src/src/routers/redirect.c
@@ -451,7 +451,7 @@ while (generated != NULL)
       }
     }
 
-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N
     next->prop.utf8_msg = string_is_utf8(next->address)
       || (sender_address && string_is_utf8(sender_address));
 #endif
@@ -475,7 +475,7 @@ while (generated != NULL)
     else
       debug_printf("gid=unset ");
 
-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N
     if (next->prop.utf8_msg) debug_printf("utf8 ");
 #endif
 
@@ -553,6 +553,12 @@ addr_prop.remove_headers = NULL;
 #ifdef EXPERIMENTAL_SRS
 addr_prop.srs_sender = NULL;
 #endif
+#ifdef SUPPORT_I18N
+addr_prop.utf8_msg = FALSE;    /*XXX should we not copy this from the parent? */
+addr_prop.utf8_downcvt = FALSE;
+addr_prop.utf8_downcvt_maybe = FALSE;
+#endif
+
 
 /* When verifying and testing addresses, the "logwrite" command in filters
 must be bypassed. */