Add perl_taintmode option

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

diff --git a/src/src/readconf.c b/src/src/readconf.c
index e52f45fcaa268b3c6abcdc78533f0355e2229d02..2dfc9af8ee8cbd4f93b7d53cedc581c2ac1f531f 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -194,6 +194,7 @@ static optionlist optionlist_config[] = {
   { "bounce_message_file",      opt_stringptr,   &bounce_message_file },
   { "bounce_message_text",      opt_stringptr,   &bounce_message_text },
   { "bounce_return_body",       opt_bool,        &bounce_return_body },
+  { "bounce_return_linesize_limit", opt_mkint,   &bounce_return_linesize_limit },
   { "bounce_return_message",    opt_bool,        &bounce_return_message },
   { "bounce_return_size_limit", opt_mkint,       &bounce_return_size_limit },
   { "bounce_sender_authentication",opt_stringptr,&bounce_sender_authentication },
@@ -343,6 +344,7 @@ static optionlist optionlist_config[] = {
 #ifdef EXIM_PERL
   { "perl_at_start",            opt_bool,        &opt_perl_at_start },
   { "perl_startup",             opt_stringptr,   &opt_perl_startup },
+  { "perl_taintmode",           opt_bool,        &opt_perl_taintmode },
 #endif
 #ifdef LOOKUP_PGSQL
   { "pgsql_servers",            opt_stringptr,   &pgsql_servers },
@@ -4297,7 +4299,7 @@ for (i = config_lines; i; i = i->next)
       ;
 
     if (next - p > 1)
-      memmove(p+1, next, strlen(next)+1);
+      memmove(p+1, next, Ustrlen(next)+1);
 
     if (*next == '"' || *next == '\'' || *next == '$')
       break;