max_parallel transport option. Bug 1698

[users/heiko/exim.git] / src / src / sieve.c

diff --git a/src/src/sieve.c b/src/src/sieve.c
index 19403deddaf143e787d716a5e997acc9be18ed9e..3d7e99b27b332c27317917f4bd8db12a865fcbef 100644 (file)
--- a/src/src/sieve.c
+++ b/src/src/sieve.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/src/sieve.c,v 1.29 2007/08/17 11:16:45 ph10 Exp $ */
-

 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) Michael Haardt 2003-2006 */
+/* Copyright (c) Michael Haardt 2003 - 2015 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This code was contributed by Michael Haardt. */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This code was contributed by Michael Haardt. */


@@ -29,13 +27,13 @@
 #undef RFC_EOL
 
 /* Define this for development of the Sieve extension "encoded-character". */
 #undef RFC_EOL
 
 /* Define this for development of the Sieve extension "encoded-character". */

-#undef ENCODED_CHARACTER
+#define ENCODED_CHARACTER

 
 /* Define this for development of the Sieve extension "envelope-auth". */
 #undef ENVELOPE_AUTH
 
 /* Define this for development of the Sieve extension "enotify".    */
 
 /* Define this for development of the Sieve extension "envelope-auth". */
 #undef ENVELOPE_AUTH
 
 /* Define this for development of the Sieve extension "enotify".    */

-#undef ENOTIFY
+#define ENOTIFY

 
 /* Define this for the Sieve extension "subaddress".                */
 #define SUBADDRESS
 
 /* Define this for the Sieve extension "subaddress".                */
 #define SUBADDRESS


@@ -71,6 +69,7 @@ struct Sieve
   int require_enotify;
   struct Notification *notified;
 #endif
   int require_enotify;
   struct Notification *notified;
 #endif

+  uschar *enotify_mailto_owner;

 #ifdef SUBADDRESS
   int require_subaddress;
 #endif
 #ifdef SUBADDRESS
   int require_subaddress;
 #endif


@@ -108,6 +107,38 @@ struct Notification
   struct Notification *next;
   };
 
   struct Notification *next;
   };
 

+/* This should be a complete list of supported extensions, so that an external
+ManageSieve (RFC 5804) program can interrogate the current Exim binary for the
+list of extensions and provide correct information to a client.
+
+We'll emit the list in the order given here; keep it alphabetically sorted, so
+that callers don't get surprised.
+
+List *MUST* end with a NULL.  Which at least makes ifdef-vs-comma easier. */
+
+const uschar *exim_sieve_extension_list[] = {
+  CUS"comparator-i;ascii-numeric",
+  CUS"copy",
+#ifdef ENCODED_CHARACTER
+  CUS"encoded-character",
+#endif
+#ifdef ENOTIFY
+  CUS"enotify",
+#endif
+  CUS"envelope",
+#ifdef ENVELOPE_AUTH
+  CUS"envelope-auth",
+#endif
+  CUS"fileinto",
+#ifdef SUBADDRESS
+  CUS"subaddress",
+#endif
+#ifdef VACATION
+  CUS"vacation",
+#endif
+  NULL
+};
+

 static int eq_asciicase(const struct String *needle, const struct String *haystack, int match_prefix);
 static int parse_test(struct Sieve *filter, int *cond, int exec);
 static int parse_commands(struct Sieve *filter, int exec, address_item **generated);
 static int eq_asciicase(const struct String *needle, const struct String *haystack, int match_prefix);
 static int parse_test(struct Sieve *filter, int *cond, int exec);
 static int parse_commands(struct Sieve *filter, int exec, address_item **generated);


@@ -147,6 +178,8 @@ static uschar str_online_c[]="online";
 static const struct String str_online={ str_online_c, 6 };
 static uschar str_maybe_c[]="maybe";
 static const struct String str_maybe={ str_maybe_c, 5 };
 static const struct String str_online={ str_online_c, 6 };
 static uschar str_maybe_c[]="maybe";
 static const struct String str_maybe={ str_maybe_c, 5 };

+static uschar str_auto_submitted_c[]="Auto-Submitted";
+static const struct String str_auto_submitted={ str_auto_submitted_c, 14 };

 #endif
 #ifdef SUBADDRESS
 static uschar str_subaddress_c[]="subaddress";
 #endif
 #ifdef SUBADDRESS
 static uschar str_subaddress_c[]="subaddress";


@@ -379,7 +412,7 @@ Returns
  -1           syntax error
 */
 
  -1           syntax error
 */
 

-static int parse_mailto_uri(struct Sieve *filter, const uschar *uri, string_item **recipient, struct String *header, struct String *body)
+static int parse_mailto_uri(struct Sieve *filter, const uschar *uri, string_item **recipient, struct String *header, struct String *subject, struct String *body)

 {
 const uschar *start;
 struct String to,hname,hvalue;
 {
 const uschar *start;
 struct String to,hname,hvalue;


@@ -478,13 +511,17 @@ if (*uri=='?')
       }
     else if (hname.length==4 && strcmpic(hname.character, US"body")==0)
       *body=hvalue;
       }
     else if (hname.length==4 && strcmpic(hname.character, US"body")==0)
       *body=hvalue;

+    else if (hname.length==7 && strcmpic(hname.character, US"subject")==0)
+      *subject=hvalue;

     else
       {
       static struct String ignore[]=
         {
     else
       {
       static struct String ignore[]=
         {

+        {US"date",4},

         {US"from",4},
         {US"from",4},

-        {US"subject",7},
-        {US"received",8}
+        {US"message-id",10},
+        {US"received",8},
+        {US"auto-submitted",14}

         };
       static struct String *end=ignore+sizeof(ignore)/sizeof(ignore[0]);
       struct String *i;
         };
       static struct String *end=ignore+sizeof(ignore)/sizeof(ignore[0]);
       struct String *i;


@@ -605,8 +642,10 @@ return (match_prefix ? nl==0 : nl==0 && hl==0);
 
 /*
 Arguments:
 
 /*
 Arguments:

-  needle      pattern to search ...
-  haystack    ... inside the haystack
+  needle          pattern to search ...
+  haystack        ... inside the haystack
+  ascii_caseless  ignore ASCII case
+  match_octet     match octets, not UTF-8 multi-octet characters

 
 Returns:      0               needle not found in haystack
               1               needle found
 
 Returns:      0               needle not found in haystack
               1               needle found


@@ -996,7 +1035,7 @@ return quoted;
 *************************************************/
 
 /*
 *************************************************/
 
 /*

-According to RFC 3028, duplicate delivery to the same address must
+According to RFC 5228, duplicate delivery to the same address must

 not happen, so the list is first searched for the address.
 
 Arguments:
 not happen, so the list is first searched for the address.
 
 Arguments:


@@ -1033,7 +1072,7 @@ if (file)
   setflag(new_addr, af_pfr|af_file);
   new_addr->mode = 0;
   }
   setflag(new_addr, af_pfr|af_file);
   new_addr->mode = 0;
   }

-new_addr->p.errors_address = NULL;
+new_addr->prop.errors_address = NULL;

 new_addr->next = *generated;
 *generated = new_addr;
 }
 new_addr->next = *generated;
 *generated = new_addr;
 }


@@ -1460,8 +1499,7 @@ if (*filter->pc=='"') /* quoted string */
       }
     else if (*filter->pc=='\\' && *(filter->pc+1)) /* quoted character */
       {
       }
     else if (*filter->pc=='\\' && *(filter->pc+1)) /* quoted character */
       {

-      if (*(filter->pc+1)=='0') data->character=string_cat(data->character,&dataCapacity,&data->length,CUS "",1);
-      else data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc+1,1);
+      data->character=string_cat(data->character,&dataCapacity,&data->length,filter->pc+1,1);

       filter->pc+=2;
       }
     else /* regular character */
       filter->pc+=2;
       }
     else /* regular character */


@@ -1932,7 +1970,7 @@ Grammar:
 Arguments:
   filter      points to the Sieve filter including its state
   n           total number of tests
 Arguments:
   filter      points to the Sieve filter including its state
   n           total number of tests

-  true        number of passed tests
+  num_true    number of passed tests

   exec        Execute parsed statements
 
 Returns:      1                success
   exec        Execute parsed statements
 
 Returns:      1                success


@@ -1940,14 +1978,14 @@ Returns:      1                success
               -1               syntax or execution error
 */
 
               -1               syntax or execution error
 */
 

-static int parse_testlist(struct Sieve *filter, int *n, int *true, int exec)
+static int parse_testlist(struct Sieve *filter, int *n, int *num_true, int exec)

 {
 if (parse_white(filter)==-1) return -1;
 if (*filter->pc=='(')
   {
   ++filter->pc;
   *n=0;
 {
 if (parse_white(filter)==-1) return -1;
 if (*filter->pc=='(')
   {
   ++filter->pc;
   *n=0;

-   *true=0;
+   *num_true=0;

   for (;;)
     {
     int cond;
   for (;;)
     {
     int cond;


@@ -1956,7 +1994,7 @@ if (*filter->pc=='(')
       {
       case -1: return -1;
       case 0: filter->errmsg=CUS "missing test"; return -1;
       {
       case -1: return -1;
       case 0: filter->errmsg=CUS "missing test"; return -1;

-      default: ++*n; if (cond) ++*true; break;
+      default: ++*n; if (cond) ++*num_true; break;

       }
     if (parse_white(filter)==-1) return -1;
     if (*filter->pc==',') ++filter->pc;
       }
     if (parse_white(filter)==-1) return -1;
     if (*filter->pc==',') ++filter->pc;


@@ -2144,13 +2182,13 @@ else if (parse_identifier(filter,CUS "allof"))
   allof-test   = "allof" <tests: test-list>
   */
 
   allof-test   = "allof" <tests: test-list>
   */
 

-  int n,true;
+  int n,num_true;

 
 

-  switch (parse_testlist(filter,&n,&true,exec))
+  switch (parse_testlist(filter,&n,&num_true,exec))

     {
     case -1: return -1;
     case 0: filter->errmsg=CUS "missing test list"; return -1;
     {
     case -1: return -1;
     case 0: filter->errmsg=CUS "missing test list"; return -1;

-    default: *cond=(n==true); return 1;
+    default: *cond=(n==num_true); return 1;

     }
   }
 else if (parse_identifier(filter,CUS "anyof"))
     }
   }
 else if (parse_identifier(filter,CUS "anyof"))


@@ -2159,13 +2197,13 @@ else if (parse_identifier(filter,CUS "anyof"))
   anyof-test   = "anyof" <tests: test-list>
   */
 
   anyof-test   = "anyof" <tests: test-list>
   */
 

-  int n,true;
+  int n,num_true;

 
 

-  switch (parse_testlist(filter,&n,&true,exec))
+  switch (parse_testlist(filter,&n,&num_true,exec))

     {
     case -1: return -1;
     case 0: filter->errmsg=CUS "missing test list"; return -1;
     {
     case -1: return -1;
     case 0: filter->errmsg=CUS "missing test list"; return -1;

-    default: *cond=(true>0); return 1;
+    default: *cond=(num_true>0); return 1;

     }
   }
 else if (parse_identifier(filter,CUS "exists"))
     }
   }
 else if (parse_identifier(filter,CUS "exists"))


@@ -2507,14 +2545,16 @@ else if (parse_identifier(filter,CUS "valid_notify_method"))
     for (u=uris; u->length!=-1 && *cond; ++u)
       {
         string_item *recipient;
     for (u=uris; u->length!=-1 && *cond; ++u)
       {
         string_item *recipient;

-        struct String header,body;
+        struct String header,subject,body;

 
         recipient=NULL;
         header.length=-1;
         header.character=(uschar*)0;
 
         recipient=NULL;
         header.length=-1;
         header.character=(uschar*)0;

+        subject.length=-1;
+        subject.character=(uschar*)0;

         body.length=-1;
         body.character=(uschar*)0;
         body.length=-1;
         body.character=(uschar*)0;

-        if (parse_mailto_uri(filter,u->character,&recipient,&header,&body)!=1)
+        if (parse_mailto_uri(filter,u->character,&recipient,&header,&subject,&body)!=1)

           *cond=0;
       }
     }
           *cond=0;
       }
     }


@@ -2586,15 +2626,17 @@ else if (parse_identifier(filter,CUS "notify_method_capability"))
     if (exec)
       {
       string_item *recipient;
     if (exec)
       {
       string_item *recipient;

-      struct String header,body;
+      struct String header,subject,body;

 
       *cond=0;
       recipient=NULL;
       header.length=-1;
       header.character=(uschar*)0;
 
       *cond=0;
       recipient=NULL;
       header.length=-1;
       header.character=(uschar*)0;

+      subject.length=-1;
+      subject.character=(uschar*)0;

       body.length=-1;
       body.character=(uschar*)0;
       body.length=-1;
       body.character=(uschar*)0;

-      if (parse_mailto_uri(filter,uri.character,&recipient,&header,&body)==1)
+      if (parse_mailto_uri(filter,uri.character,&recipient,&header,&subject,&body)==1)

         {
         if (eq_asciicase(&capa,&str_online,0)==1)
           for (k=keys; k->length!=-1; ++k)
         {
         if (eq_asciicase(&capa,&str_online,0)==1)
           for (k=keys; k->length!=-1; ++k)


@@ -2695,8 +2737,8 @@ Returns:      2                success by stop
               1                other success
               -1               syntax or execution error
 */
               1                other success
               -1               syntax or execution error
 */

-static int parse_commands(struct Sieve *filter, int exec,
-  address_item **generated)
+static int
+parse_commands(struct Sieve *filter, int exec, address_item **generated)

 {
 while (*filter->pc)
   {
 {
 while (*filter->pc)
   {


@@ -2928,14 +2970,16 @@ while (*filter->pc)
     int m;
     struct String from;
     struct String importance;
     int m;
     struct String from;
     struct String importance;

-    struct String *options;

     struct String message;
     struct String method;
     struct Notification *already;
     string_item *recipient;
     struct String header;
     struct String message;
     struct String method;
     struct Notification *already;
     string_item *recipient;
     struct String header;

+    struct String subject;

     struct String body;
     struct String body;

-    uschar *envelope_from,*envelope_to;
+    uschar *envelope_from;
+    struct String auto_submitted_value;
+    uschar *auto_submitted_def;

 
     if (!filter->require_enotify)
       {
 
     if (!filter->require_enotify)
       {


@@ -2946,16 +2990,16 @@ while (*filter->pc)
     from.length=-1;
     importance.character=(uschar*)0;
     importance.length=-1;
     from.length=-1;
     importance.character=(uschar*)0;
     importance.length=-1;

-    options=(struct String*)0;

     message.character=(uschar*)0;
     message.length=-1;
     recipient=NULL;
     header.length=-1;
     header.character=(uschar*)0;
     message.character=(uschar*)0;
     message.length=-1;
     recipient=NULL;
     header.length=-1;
     header.character=(uschar*)0;

+    subject.length=-1;
+    subject.character=(uschar*)0;

     body.length=-1;
     body.character=(uschar*)0;
     body.length=-1;
     body.character=(uschar*)0;

-    envelope_from=expand_string("$sender_address");
-    envelope_to=expand_string("$local_part_prefix$local_part$local_part_suffix@$domain");
+    envelope_from=(sender_address && sender_address[0]) ? expand_string(US"$local_part_prefix$local_part$local_part_suffix@$domain") : US "";

     for (;;)
       {
       if (parse_white(filter)==-1) return -1;
     for (;;)
       {
       if (parse_white(filter)==-1) return -1;


@@ -3004,74 +3048,94 @@ while (*filter->pc)
       return -1;
       }
     if (parse_semicolon(filter)==-1) return -1;
       return -1;
       }
     if (parse_semicolon(filter)==-1) return -1;

-
-    for (already=filter->notified; already; already=already->next)
-      {
-      if (already->method.length==method.length
-          && (method.length==-1 || strcmp(already->method.character,method.character)==0)
-          && already->importance.length==importance.length
-          && (importance.length==-1 || strcmp(already->importance.character,importance.character)==0)
-          && already->message.length==message.length
-          && (message.length==-1 || strcmp(already->message.character,message.character)==0))
-        break;
-      }
-    if (already==(struct Notification*)0)
-      /* New notification, process it */
+    if (parse_mailto_uri(filter,method.character,&recipient,&header,&subject,&body)!=1)
+      return -1;
+    if (exec)

       {
       {

-      if (parse_mailto_uri(filter,method.character,&recipient,&header,&body)!=1)
-        return -1;
-      struct Notification *sent;
-      sent=store_get(sizeof(struct Notification));
-      sent->method=method;
-      sent->importance=importance;
-      sent->message=message;
-      sent->next=filter->notified;
-      filter->notified=sent;
-      if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0)
+      if (message.length==-1) message=subject;
+      if (message.length==-1) expand_header(&message,&str_subject);
+      expand_header(&auto_submitted_value,&str_auto_submitted);
+      auto_submitted_def=expand_string(string_sprintf("${if def:header_auto-submitted {true}{false}}"));
+      if (auto_submitted_value.character == NULL || auto_submitted_def == NULL)

         {
         {

-        debug_printf("Notification to `%s'.\n",method.character);
+        filter->errmsg=CUS "header string expansion failed";
+        return -1;

         }
         }

-#ifndef COMPILE_SYNTAX_CHECKER
-      if (exec && filter_test == FTEST_NONE)
+        if (Ustrcmp(auto_submitted_def,"true")!=0 || Ustrcmp(auto_submitted_value.character,"no")==0)

         {
         {

-        string_item *p;
-        header_line *h;
-        int pid,fd;
+        for (already=filter->notified; already; already=already->next)
+          {
+          if (already->method.length==method.length
+              && (method.length==-1 || Ustrcmp(already->method.character,method.character)==0)
+              && already->importance.length==importance.length
+              && (importance.length==-1 || Ustrcmp(already->importance.character,importance.character)==0)
+              && already->message.length==message.length
+              && (message.length==-1 || Ustrcmp(already->message.character,message.character)==0))
+            break;
+          }
+        if (already==(struct Notification*)0)
+          /* New notification, process it */
+          {
+          struct Notification *sent;
+          sent=store_get(sizeof(struct Notification));
+          sent->method=method;
+          sent->importance=importance;
+          sent->message=message;
+          sent->next=filter->notified;
+          filter->notified=sent;
+  #ifndef COMPILE_SYNTAX_CHECKER
+          if (filter_test == FTEST_NONE)
+            {
+            string_item *p;
+            int pid,fd;

 
 

-        if ((pid = child_open_exim2(&fd,envelope_to,envelope_to))>=1)
+            if ((pid = child_open_exim2(&fd,envelope_from,envelope_from))>=1)
+              {
+              FILE *f;
+              uschar *buffer;
+              int buffer_capacity;
+
+              f = fdopen(fd, "wb");
+              fprintf(f,"From: %s\n",from.length==-1 ? expand_string(US"$local_part_prefix$local_part$local_part_suffix@$domain") : from.character);
+              for (p=recipient; p; p=p->next) fprintf(f,"To: %s\n",p->text);
+              fprintf(f,"Auto-Submitted: auto-notified; %s\n",filter->enotify_mailto_owner);
+              if (header.length>0) fprintf(f,"%s",header.character);
+              if (message.length==-1)
+                {
+                message.character=US"Notification";
+                message.length=Ustrlen(message.character);
+                }
+              /* Allocation is larger than neccessary, but enough even for split MIME words */
+              buffer_capacity=32+4*message.length;
+              buffer=store_get(buffer_capacity);
+              if (message.length!=-1) fprintf(f,"Subject: %s\n",parse_quote_2047(message.character, message.length, US"utf-8", buffer, buffer_capacity, TRUE));
+              fprintf(f,"\n");
+              if (body.length>0) fprintf(f,"%s\n",body.character);
+              fflush(f);
+              (void)fclose(f);
+              (void)child_close(pid, 0);
+              }
+            }
+          if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0)
+            {
+            debug_printf("Notification to `%s': '%s'.\n",method.character,message.length!=-1 ? message.character : CUS "");
+            }
+#endif
+          }
+        else

           {
           {

-          FILE *f;
-          uschar *buffer;
-          int buffer_capacity;
-
-          f = fdopen(fd, "wb");
-          for (h = header_list; h != NULL; h = h->next)
-            if (h->type == htype_received) fprintf(f,"%s",h->text);
-          fprintf(f,"From: %s\n",from.length==-1 ? envelope_to : from.character);
-          for (p=recipient; p; p=p->next) fprintf(f,"To: %s\n",p->text);
-          if (header.length>0) fprintf(f,"%s",header.character);
-          if (message.length==-1)
+          if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0)

             {
             {

-            message.character=US"Notification";
-            message.length=Ustrlen(message.character);
+            debug_printf("Repeated notification to `%s' ignored.\n",method.character);

             }
             }

-          /* Allocation is larger than neccessary, but enough even for split MIME words */
-          buffer_capacity=32+4*message.length;
-          buffer=store_get(buffer_capacity);
-          fprintf(f,"Subject: %s\n\n",parse_quote_2047(message.character, message.length, US"utf-8", buffer, buffer_capacity, TRUE));
-          if (body.length>0) fprintf(f,"%s\n",body.character);
-          fflush(f);
-          (void)fclose(f);
-          (void)child_close(pid, 0);

           }
         }
           }
         }

-#endif
-      }
-    else
-      {
-      if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0)
+      else

         {
         {

-        debug_printf("Repeated notification to `%s' ignored.\n",method.character);
+        if ((filter_test != FTEST_NONE && debug_selector != 0) || (debug_selector & D_filter) != 0)
+          {
+          debug_printf("Ignoring notification, triggering message contains Auto-submitted: field.\n");
+          }

         }
       }
     }
         }
       }
     }


@@ -3296,7 +3360,8 @@ while (*filter->pc)
           /* Allocation is larger than neccessary, but enough even for split MIME words */
           buffer_capacity=32+4*subject.length;
           buffer=store_get(buffer_capacity);
           /* Allocation is larger than neccessary, but enough even for split MIME words */
           buffer_capacity=32+4*subject.length;
           buffer=store_get(buffer_capacity);

-          addr->reply->subject=parse_quote_2047(subject.character, subject.length, US"utf-8", buffer, buffer_capacity, TRUE);
+         /* deconst cast safe as we pass in a non-const item */
+          addr->reply->subject = US parse_quote_2047(subject.character, subject.length, US"utf-8", buffer, buffer_capacity, TRUE);

           addr->reply->oncelog=once;
           addr->reply->once_repeat=days*86400;
 
           addr->reply->oncelog=once;
           addr->reply->once_repeat=days*86400;
 


@@ -3365,8 +3430,8 @@ Returns:      1                success
               -1               syntax or execution error
 */
 
               -1               syntax or execution error
 */
 

-static int parse_start(struct Sieve *filter, int exec,
-  address_item **generated)
+static int
+parse_start(struct Sieve *filter, int exec, address_item **generated)

 {
 filter->pc=filter->filter;
 filter->line=1;
 {
 filter->pc=filter->filter;
 filter->line=1;


@@ -3455,7 +3520,15 @@ while (parse_identifier(filter,CUS "require"))
     else if (eq_octet(check,&str_envelope_auth,0)) filter->require_envelope_auth=1;
 #endif
 #ifdef ENOTIFY
     else if (eq_octet(check,&str_envelope_auth,0)) filter->require_envelope_auth=1;
 #endif
 #ifdef ENOTIFY

-    else if (eq_octet(check,&str_enotify,0)) filter->require_enotify=1;
+    else if (eq_octet(check,&str_enotify,0))
+      {
+      if (filter->enotify_mailto_owner == NULL)
+        {
+        filter->errmsg=CUS "enotify disabled";
+        return -1;
+        }
+        filter->require_enotify=1;
+      }

 #endif
 #ifdef SUBADDRESS
     else if (eq_octet(check,&str_subaddress,0)) filter->require_subaddress=1;
 #endif
 #ifdef SUBADDRESS
     else if (eq_octet(check,&str_subaddress,0)) filter->require_subaddress=1;


@@ -3503,7 +3576,8 @@ Arguments:
   filter      points to the entire file, read into store as a single string
   options     controls whether various special things are allowed, and requests
               special actions (not currently used)
   filter      points to the entire file, read into store as a single string
   options     controls whether various special things are allowed, and requests
               special actions (not currently used)

-  sieve_vacation_directory  where to store vacation "once" files
+  vacation_directory    where to store vacation "once" files
+  enotify_mailto_owner  owner of mailto notifications

   useraddress string expression for :user part of address
   subaddress  string expression for :subaddress part of address
   generated   where to hang newly-generated addresses
   useraddress string expression for :user part of address
   subaddress  string expression for :subaddress part of address
   generated   where to hang newly-generated addresses


@@ -3519,7 +3593,8 @@ Returns:      FF_DELIVERED     success, a significant action was taken
 
 int
 sieve_interpret(uschar *filter, int options, uschar *vacation_directory,
 
 int
 sieve_interpret(uschar *filter, int options, uschar *vacation_directory,

-  uschar *useraddress, uschar *subaddress, address_item **generated, uschar **error)
+  uschar *enotify_mailto_owner, uschar *useraddress, uschar *subaddress,
+  address_item **generated, uschar **error)

 {
 struct Sieve sieve;
 int r;
 {
 struct Sieve sieve;
 int r;


@@ -3545,6 +3620,20 @@ else
     }
   }
 
     }
   }
 

+if (enotify_mailto_owner == NULL)
+  sieve.enotify_mailto_owner = NULL;
+else
+  {
+  sieve.enotify_mailto_owner=expand_string(enotify_mailto_owner);
+  if (sieve.enotify_mailto_owner == NULL)
+    {
+    *error = string_sprintf("failed to expand \"%s\" "
+      "(sieve_enotify_mailto_owner): %s", enotify_mailto_owner,
+      expand_string_message);
+    return FF_ERROR;
+    }
+  }
+

 sieve.useraddress = useraddress == NULL ? CUS "$local_part_prefix$local_part$local_part_suffix" : useraddress;
 sieve.subaddress = subaddress;
 
 sieve.useraddress = useraddress == NULL ? CUS "$local_part_prefix$local_part$local_part_suffix" : useraddress;
 sieve.subaddress = subaddress;