Guard smtp_user_msg() with EXPERIMENTAL_PRDR check.

[exim.git] / src / src / readconf.c

diff --git a/src/src/readconf.c b/src/src/readconf.c
index ddd81d1d33f54d0c8b369a265057e040c614b474..bba5325945bfaa5386382bd071bedf74e1a7fad0 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -140,6 +140,9 @@ static optionlist optionlist_config[] = {
   { "acl_smtp_auth",            opt_stringptr,   &acl_smtp_auth },
   { "acl_smtp_connect",         opt_stringptr,   &acl_smtp_connect },
   { "acl_smtp_data",            opt_stringptr,   &acl_smtp_data },
+#ifdef EXPERIMENTAL_PRDR
+  { "acl_smtp_data_prdr",       opt_stringptr,   &acl_smtp_data_prdr },
+#endif
 #ifndef DISABLE_DKIM
   { "acl_smtp_dkim",            opt_stringptr,   &acl_smtp_dkim },
 #endif
@@ -316,6 +319,9 @@ static optionlist optionlist_config[] = {
 #endif
   { "pid_file_path",            opt_stringptr,   &pid_file_path },
   { "pipelining_advertise_hosts", opt_stringptr, &pipelining_advertise_hosts },
+#ifdef EXPERIMENTAL_PRDR
+  { "prdr_enable",              opt_bool,        &prdr_enable },
+#endif
   { "preserve_message_logs",    opt_bool,        &preserve_message_logs },
   { "primary_hostname",         opt_stringptr,   &primary_hostname },
   { "print_topbitchars",        opt_bool,        &print_topbitchars },
@@ -1549,7 +1555,7 @@ switch (type)
      {
       uschar sep = Ustrncmp(name, "headers_add", 11)==0 ? '\n' : ':';
       saved_condition = *str_target;
-      strtemp = saved_condition + strlen(saved_condition)-1;
+      strtemp = saved_condition + Ustrlen(saved_condition)-1;
       if (*strtemp == sep) *strtemp = 0;       /* eliminate trailing list-sep */
       strtemp = string_sprintf("%s%c%s", saved_condition, sep, sptr);
       *str_target = string_copy_malloc(strtemp);