taint: allow appendfile create_file option to specify a de-tainting safe path
authorJeremy Harris <jgh146exb@wizmail.org>
Wed, 14 Apr 2021 21:21:05 +0000 (22:21 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Wed, 14 Apr 2021 21:23:05 +0000 (22:23 +0100)
328 files changed:
doc/doc-docbook/spec.xfpt
src/src/transports/appendfile.c
test/confs/0001
test/confs/0006
test/confs/0008
test/confs/0009
test/confs/0010
test/confs/0011
test/confs/0012
test/confs/0014
test/confs/0015
test/confs/0016
test/confs/0021
test/confs/0022
test/confs/0023
test/confs/0024
test/confs/0025
test/confs/0026
test/confs/0027
test/confs/0028
test/confs/0031
test/confs/0032
test/confs/0036
test/confs/0037
test/confs/0040
test/confs/0041
test/confs/0042
test/confs/0043
test/confs/0044
test/confs/0046
test/confs/0048
test/confs/0049
test/confs/0050
test/confs/0051
test/confs/0052
test/confs/0053
test/confs/0055
test/confs/0072
test/confs/0073
test/confs/0074
test/confs/0075
test/confs/0076
test/confs/0079
test/confs/0080
test/confs/0081
test/confs/0082
test/confs/0083
test/confs/0090
test/confs/0094
test/confs/0095
test/confs/0096
test/confs/0097
test/confs/0098
test/confs/0100
test/confs/0102
test/confs/0103
test/confs/0104
test/confs/0105
test/confs/0107
test/confs/0110
test/confs/0111
test/confs/0113
test/confs/0116
test/confs/0118
test/confs/0121
test/confs/0127
test/confs/0128
test/confs/0131
test/confs/0133
test/confs/0135
test/confs/0136
test/confs/0137
test/confs/0138
test/confs/0139
test/confs/0140
test/confs/0142
test/confs/0149
test/confs/0150
test/confs/0151
test/confs/0152
test/confs/0156
test/confs/0158
test/confs/0159
test/confs/0164
test/confs/0165
test/confs/0166
test/confs/0167
test/confs/0169
test/confs/0171
test/confs/0172
test/confs/0173
test/confs/0174
test/confs/0175
test/confs/0176
test/confs/0177
test/confs/0178
test/confs/0182
test/confs/0185
test/confs/0189
test/confs/0192
test/confs/0193
test/confs/0194
test/confs/0195
test/confs/0196
test/confs/0202
test/confs/0204
test/confs/0205
test/confs/0210
test/confs/0211
test/confs/0212
test/confs/0220
test/confs/0221
test/confs/0222
test/confs/0223
test/confs/0224
test/confs/0225
test/confs/0226
test/confs/0230
test/confs/0231
test/confs/0232
test/confs/0233
test/confs/0237
test/confs/0240
test/confs/0241
test/confs/0243
test/confs/0246
test/confs/0253
test/confs/0256
test/confs/0258
test/confs/0260
test/confs/0264
test/confs/0266
test/confs/0267
test/confs/0270
test/confs/0271
test/confs/0274
test/confs/0280
test/confs/0281
test/confs/0282
test/confs/0283
test/confs/0284
test/confs/0289
test/confs/0296
test/confs/0298
test/confs/0299
test/confs/0306
test/confs/0307
test/confs/0309
test/confs/0310
test/confs/0318
test/confs/0319
test/confs/0321
test/confs/0324
test/confs/0326
test/confs/0327
test/confs/0328
test/confs/0329
test/confs/0330
test/confs/0335
test/confs/0338
test/confs/0345
test/confs/0346
test/confs/0351
test/confs/0352
test/confs/0353
test/confs/0354
test/confs/0355
test/confs/0359
test/confs/0362
test/confs/0374
test/confs/0375
test/confs/0377
test/confs/0379
test/confs/0380
test/confs/0383
test/confs/0385
test/confs/0386
test/confs/0393
test/confs/0395
test/confs/0398
test/confs/0404
test/confs/0408
test/confs/0412
test/confs/0421
test/confs/0428
test/confs/0431
test/confs/0436
test/confs/0444
test/confs/0446
test/confs/0449
test/confs/0452
test/confs/0456
test/confs/0460
test/confs/0461
test/confs/0472
test/confs/0480
test/confs/0481
test/confs/0485
test/confs/0487
test/confs/0491
test/confs/0493
test/confs/0494
test/confs/0495
test/confs/0496
test/confs/0500
test/confs/0503
test/confs/0504
test/confs/0508
test/confs/0514
test/confs/0517
test/confs/0522
test/confs/0523
test/confs/0530
test/confs/0531
test/confs/0532
test/confs/0533
test/confs/0535
test/confs/0536
test/confs/0551
test/confs/0566
test/confs/0567
test/confs/0571
test/confs/0573
test/confs/0593
test/confs/0600
test/confs/0606
test/confs/0609
test/confs/0612
test/confs/0900
test/confs/0901
test/confs/0906
test/confs/1001
test/confs/1002
test/confs/1003
test/confs/1103
test/confs/1104
test/confs/1105
test/confs/1110
test/confs/1150
test/confs/1152
test/confs/1157
test/confs/1159
test/confs/1160
test/confs/1163
test/confs/2002
test/confs/2014
test/confs/2027
test/confs/2032
test/confs/2102
test/confs/2114
test/confs/2127
test/confs/2132
test/confs/2149
test/confs/2201
test/confs/3206
test/confs/3207
test/confs/3400
test/confs/3403
test/confs/3408
test/confs/3411
test/confs/3451
test/confs/3452
test/confs/3461
test/confs/3462
test/confs/3500
test/confs/3700
test/confs/3720
test/confs/4000
test/confs/4002
test/confs/4201
test/confs/4211
test/confs/4221
test/confs/4520
test/confs/4525
test/confs/4560
test/confs/4565
test/confs/4620
test/confs/4700
test/confs/5003
test/confs/5005
test/confs/5006
test/confs/5007
test/confs/5008
test/confs/5050
test/confs/5101
test/confs/5200
test/confs/5201
test/confs/5203
test/confs/5204
test/confs/5207
test/confs/5500
test/confs/5600
test/confs/5610
test/confs/5611
test/confs/5650
test/confs/5651
test/confs/5665
test/confs/5670
test/confs/5730
test/confs/5740
test/confs/5902
test/confs/9001
test/confs/9400
test/confs/9401
test/log/0318
test/log/0593
test/mail/0318.subdir/userx [new file with mode: 0644]
test/mail/0318.userx [deleted file]
test/msglog/0584.10HmaX-0005vi-00
test/msglog/0593.10HmaX-0005vi-00
test/paniclog/0593
test/runtest
test/scripts/0000-Basic/0593
test/stderr/0023
test/stderr/0026
test/stderr/0042
test/stderr/0169
test/stderr/0386
test/stderr/0393
test/stderr/0404
test/stderr/0408
test/stderr/0487
test/stderr/0593
test/stderr/5005
test/stderr/5006
test/stderr/5008
test/stderr/5204
test/stdout/0593

index 5c42afc93f6163ba6cd4f02410658bdcf4ed0eba..437b13df0410c4e0c62abeb2b508876f834657f2 100644 (file)
@@ -22998,6 +22998,11 @@ If &%file%& or &%directory%& is set for a delivery from a redirection, it is
 used to determine the file or directory name for the delivery. Normally, the
 contents of &$address_file$& are used in some way in the string expansion.
 .endlist
+If the &%create_file%& option is set to a path which
+matches (see the option definition below for details)
+a file or directory name
+for the delivery, that name becomes de-tainted.
+
 .cindex "tainted data" "in filenames"
 .cindex appendfile "tainted data"
 Tainted data may not be used for a file or directory name.
@@ -23145,14 +23150,34 @@ directories defined by the &%directory%& option. In the case of maildir
 delivery, it applies to the top level directory, not the maildir directories
 beneath.
 
+.new
 The option must be set to one of the words &"anywhere"&, &"inhome"&, or
-&"belowhome"&. In the second and third cases, a home directory must have been
-set for the transport. This option is not useful when an explicit filename is
+&"belowhome"&, or to an absolute path.
+.wen
+
+In the second and third cases, a home directory must have been
+set for the transport, and the file or directory being created must
+reside within it.
+The "belowhome" checking additionally checks for attempts to use "../"
+to evade the testing.
+This option is not useful when an explicit filename is
 given for normal mailbox deliveries. It is intended for the case when filenames
 are generated from users' &_.forward_& files. These are usually handled
 by an &(appendfile)& transport called &%address_file%&. See also
 &%file_must_exist%&.
 
+.new
+In the fourth case,
+the value given for this option must be an absolute path for an
+existing directory.
+The value is used for checking instead of a home directory;
+checking is done in "belowhome" mode.
+
+.cindex "tainted data" "de-tainting"
+If "belowhome" checking is used, the file or directory path
+becomes de-tainted.
+.wen
+
 
 .option directory appendfile string&!! unset
 This option is mutually exclusive with the &%file%& option, but one of &%file%&
@@ -23165,6 +23190,11 @@ appended to a single mailbox file. A number of different formats are provided
 (see &%maildir_format%& and &%mailstore_format%&), and see section
 &<<SECTopdir>>& for further details of this form of delivery.
 
+.new
+The result of expansion must not be tainted, unless the &%create_file%& option
+specifies a path.
+.wen
+
 
 .option directory_file appendfile string&!! "see below"
 .cindex "base62"
@@ -23197,6 +23227,11 @@ specifies a single file, to which the message is appended. One or more of
 &%use_fcntl_lock%&, &%use_flock_lock%&, or &%use_lockfile%& must be set with
 &%file%&.
 
+.new
+The result of expansion must not be tainted, unless the &%create_file%& option
+specifies a path.
+.wen
+
 .cindex "NFS" "lock file"
 .cindex "locking files"
 .cindex "lock files"
index 3f2c4e4437d40274a546a2497bf5b192230f6868..139f9a3ef95b67f8790cb76d40277cfc1fe9c298 100644 (file)
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) University of Cambridge 1995 - 2020 */
 /* Copyright (c) The Exim maintainers 2020 */
 /* See the file NOTICE for conditions of use and distribution. */
 
@@ -112,70 +112,27 @@ BOOL appendfile_transport_entry(transport_instance *tblock, address_item *addr)
 /* Default private options block for the appendfile transport. */
 
 appendfile_transport_options_block appendfile_transport_option_defaults = {
-  NULL,           /* filename */
-  NULL,           /* dirname */
-  US"q${base62:$tod_epoch}-$inode", /* dirfilename */
-  NULL,           /* message_prefix (default reset in init if not bsmtp) */
-  NULL,           /* message_suffix (ditto) */
-  US"anywhere",   /* create_file_string (string value for create_file) */
-  NULL,           /* quota */
-  NULL,           /* quota_directory */
-  NULL,           /* quota_filecount */
-  NULL,           /* quota_size_regex */
-  NULL,           /* quota_warn_threshold */
-  NULL,           /* mailbox_size_string */
-  NULL,           /* mailbox_filecount_string */
-  NULL,           /* expand_maildir_use_size_file */
-  US"^(?:cur|new|\\..*)$",  /* maildir_dir_regex */
-  NULL,           /* maildir_tag */
-  NULL,           /* maildirfolder_create_regex */
-  NULL,           /* mailstore_prefix */
-  NULL,           /* mailstore_suffix */
-  NULL,           /* check_string (default changed for non-bsmtp file)*/
-  NULL,           /* escape_string (ditto) */
-  NULL,           /* file_format */
-  0,              /* quota_value */
-  0,              /* quota_warn_threshold_value */
-  -1,             /* mailbox_size_value */
-  -1,             /* mailbox_filecount_value */
-  0,              /* quota_filecount_value */
-  APPENDFILE_MODE,           /* mode */
-  APPENDFILE_DIRECTORY_MODE, /* dirmode */
-  APPENDFILE_LOCKFILE_MODE,  /* lockfile_mode */
-  30*60,          /* lockfile_timeout */
-  0,              /* lock_fcntl_timeout */
-  0,              /* lock_flock_timeout */
-  10,             /* lock_retries */
-   3,             /* lock_interval */
-  10,             /* maildir_retries */
-  create_anywhere,/* create_file */
-  0,              /* options */
-  FALSE,          /* allow_fifo */
-  FALSE,          /* allow_symlink */
-  FALSE,          /* check_group */
-  TRUE,           /* check_owner */
-  TRUE,           /* create_directory */
-  FALSE,          /* notify_comsat */
-  TRUE,           /* use_lockfile */
-  FALSE,          /* set_use_lockfile */
-  TRUE,           /* use_fcntl */
-  FALSE,          /* set_use_fcntl */
-  FALSE,          /* use_flock */
-  FALSE,          /* set_use_flock */
-  FALSE,          /* use_mbx_lock */
-  FALSE,          /* set_use_mbx_lock */
-  FALSE,          /* use_bsmtp */
-  FALSE,          /* use_crlf */
-  FALSE,          /* file_must_exist */
-  TRUE,           /* mode_fail_narrower */
-  FALSE,          /* maildir_format */
-  FALSE,          /* maildir_use_size_file */
-  FALSE,          /* mailstore_format */
-  FALSE,          /* mbx_format */
-  FALSE,          /* quota_warn_threshold_is_percent */
-  TRUE,           /* quota_is_inclusive */
-  FALSE,          /* quota_no_check */
-  FALSE           /* quota_filecount_no_check */
+  /* all non-mentioned members zero/null/false */
+  .dirfilename = US"q${base62:$tod_epoch}-$inode",
+  .create_file_string = US"anywhere",
+  .maildir_dir_regex = US"^(?:cur|new|\\..*)$",
+  .mailbox_size_value = -1,
+  .mailbox_filecount_value = -1,
+  .mode = APPENDFILE_MODE,
+  .dirmode = APPENDFILE_DIRECTORY_MODE,
+  .lockfile_mode = APPENDFILE_LOCKFILE_MODE,
+  .lockfile_timeout = 30*60,
+  .lock_retries = 10,
+   .lock_interval = 3,
+  .maildir_retries = 10,
+  .create_file = create_anywhere,
+  .check_owner = TRUE,
+  .create_directory = TRUE,
+  .notify_comsat = FALSE,
+  .use_lockfile = TRUE,
+  .use_fcntl = TRUE,
+  .mode_fail_narrower = TRUE,
+  .quota_is_inclusive = TRUE,
 };
 
 
@@ -235,17 +192,15 @@ mailbox_filecount */
 
 for (int i = 0; i < 5; i++)
   {
-  double d;
+  double d = default_value;
   int no_check = 0;
   uschar *which = NULL;
 
-  if (q == NULL) d = default_value;
-  else
+  if (q)
     {
-    uschar *rest;
-    uschar *s = expand_string(q);
+    uschar * rest, * s;
 
-    if (!s)
+    if (!(s =  expand_string(q)))
       {
       *errmsg = string_sprintf("Expansion of \"%s\" in %s transport failed: "
         "%s", q, tblock->name, expand_string_message);
@@ -315,8 +270,8 @@ for (int i = 0; i < 5; i++)
       break;
 
     case 2:
-    if (d >= 2.0*1024.0*1024.0*1024.0 && sizeof(off_t) <= 4)
-       which = US"quota_warn_threshold";
+      if (d >= 2.0*1024.0*1024.0*1024.0 && sizeof(off_t) <= 4)
+         which = US"quota_warn_threshold";
       ob->quota_warn_threshold_value = (off_t)d;
       q = ob->mailbox_size_string;
       default_value = -1.0;
@@ -362,6 +317,7 @@ appendfile_transport_init(transport_instance *tblock)
 {
 appendfile_transport_options_block *ob =
   (appendfile_transport_options_block *)(tblock->options_block);
+uschar * s;
 
 /* Set up the setup entry point, to be called in the privileged state */
 
@@ -460,20 +416,17 @@ if (tblock->uid_set && !tblock->gid_set && !tblock->expand_gid)
 /* If "create_file" is set, check that a valid option is given, and set the
 integer variable. */
 
-if (ob->create_file_string)
+if ((s = ob->create_file_string ) && *s)
   {
-  int value = 0;
-  if (Ustrcmp(ob->create_file_string, "anywhere") == 0)
-    value = create_anywhere;
-  else if (Ustrcmp(ob->create_file_string, "belowhome") == 0)
-    value = create_belowhome;
-  else if (Ustrcmp(ob->create_file_string, "inhome") == 0)
-    value = create_inhome;
+  int val = 0;
+  if (Ustrcmp(s, "anywhere") == 0)                     val = create_anywhere;
+  else if (*s == '/' || Ustrcmp(s, "belowhome") == 0)  val = create_belowhome;
+  else if (Ustrcmp(s, "inhome") == 0)                  val = create_inhome;
   else
     log_write(0, LOG_PANIC_DIE|LOG_CONFIG,
-      "invalid value given for \"file_create\" for the %s transport: %s",
-        tblock->name, ob->create_file_string);
-  ob->create_file = value;
+      "invalid value given for \"file_create\" for the %s transport: '%s'",
+      tblock->name, s);
+  ob->create_file = val;
   }
 
 /* If quota_warn_threshold is set, set up default for warn_message. It may
@@ -936,28 +889,28 @@ we can't do any tests.
 Arguments:
   filename     the file name
   create_file  the ob->create_file option
+  deliver_dir  the delivery directory
 
 Returns:       TRUE if creation is permitted
 */
 
 static BOOL
-check_creation(uschar *filename, int create_file)
+check_creation(uschar *filename, int create_file, const uschar * deliver_dir)
 {
 BOOL yield = TRUE;
 
-if (deliver_home  &&  create_file != create_anywhere)
+if (deliver_dir  &&  create_file != create_anywhere)
   {
-  int len = Ustrlen(deliver_home);
+  int len = Ustrlen(deliver_dir);
   uschar *file = filename;
 
   while (file[0] == '/' && file[1] == '/') file++;
-  if (Ustrncmp(file, deliver_home, len) != 0 || file[len] != '/' ||
-       ( Ustrchr(file+len+2, '/') != NULL &&
-         (
-         create_file != create_belowhome ||
-         Ustrstr(file+len, "/../") != NULL
-         )
-       )
+  if (  Ustrncmp(file, deliver_dir, len) != 0
+     || file[len] != '/'
+     ||    Ustrchr(file+len+2, '/') != NULL
+       && (  create_file != create_belowhome
+          || Ustrstr(file+len, "/../") != NULL
+          )
      ) yield = FALSE;
 
   /* If yield is TRUE, the file name starts with the home directory, and does
@@ -995,10 +948,10 @@ if (deliver_home  &&  create_file != create_anywhere)
     if (rp)
       {
       uschar hdbuffer[PATH_MAX+1];
-      uschar *rph = deliver_home;
+      const uschar * rph = deliver_dir;
       int rlen = Ustrlen(big_buffer);
 
-      if ((rp = US realpath(CS deliver_home, CS hdbuffer)))
+      if ((rp = US realpath(CS deliver_dir, CS hdbuffer)))
         {
         rph = hdbuffer;
         len = Ustrlen(rph);
@@ -1009,7 +962,7 @@ if (deliver_home  &&  create_file != create_anywhere)
         {
         yield = FALSE;
         DEBUG(D_transport) debug_printf("Real path \"%s\" does not match \"%s\"\n",
-          big_buffer, deliver_home);
+          big_buffer, deliver_dir);
         }
       }
     }
@@ -1179,6 +1132,7 @@ appendfile_transport_entry(
 appendfile_transport_options_block *ob =
   (appendfile_transport_options_block *)(tblock->options_block);
 struct stat statbuf;
+const uschar * deliver_dir;
 uschar *fdname = NULL;
 uschar *filename = NULL;
 uschar *hitchname = NULL;
@@ -1282,12 +1236,6 @@ if (!(path = expand_string(fdname)))
     expand_string_message);
   goto ret_panic;
   }
-if (is_tainted(path))
-  {
-  addr->message = string_sprintf("Tainted '%s' (file or directory "
-    "name for %s transport) not permitted", path, tblock->name);
-  goto ret_panic;
-  }
 
 if (path[0] != '/')
   {
@@ -1364,6 +1312,12 @@ if (f.dont_deliver)
   return FALSE;
   }
 
+/* If an absolute path was given for create_file the it overrides deliver_home
+(here) and de-taints the filename (below, after check_creation() */
+
+deliver_dir = *ob->create_file_string == '/'
+  ? ob->create_file_string : deliver_home;
+
 /* Handle the case of a file name. If the file name is /dev/null, we can save
 ourselves some effort and just give a success return right away. */
 
@@ -1380,10 +1334,20 @@ if (!isdirectory)
     }
 
   /* Set the name of the file to be opened, and the file to which the data
-  is written, and find out if we are permitted to create a non-existent file. */
+  is written, and find out if we are permitted to create a non-existent file.
+  If the create_file option is an absolute path and the file was within it,
+  de-taint.  Chaeck for a tainted path. */
+
+  if (  (allow_creation_here = check_creation(path, ob->create_file, deliver_dir))
+     && ob->create_file == create_belowhome)
+    if (is_tainted(path))
+      {
+      DEBUG(D_transport) debug_printf("de-tainting path '%s'\n", path);
+      path = string_copy_taint(path, FALSE);
+      }
 
+  if (is_tainted(path)) goto tainted_ret_panic;
   dataname = filename = path;
-  allow_creation_here = check_creation(filename, ob->create_file);
 
   /* If ob->create_directory is set, attempt to create the directories in
   which this mailbox lives, but only if we are permitted to create the file
@@ -1399,7 +1363,7 @@ if (!isdirectory)
       addr->basic_errno = errno;
       addr->message =
         string_sprintf("failed to create directories for %s: %s", path,
-          strerror(errno));
+          exim_errstr(errno));
       DEBUG(D_transport) debug_printf("%s transport: %s\n", tblock->name, path);
       return FALSE;
       }
@@ -2200,10 +2164,11 @@ scanning is expensive; for maildirs some fudges have been invented:
 
 else
   {
-  uschar *check_path = path;    /* Default quota check path */
+  uschar *check_path;          /* Default quota check path */
   const pcre *regex = NULL;     /* Regex for file size from file name */
 
-  if (!check_creation(string_sprintf("%s/any", path), ob->create_file))
+  if (!check_creation(string_sprintf("%s/any", path),
+                     ob->create_file, deliver_dir))
     {
     addr->basic_errno = ERRNO_BADCREATE;
     addr->message = string_sprintf("tried to create file in %s, but "
@@ -2211,6 +2176,20 @@ else
     goto RETURN;
     }
 
+  /* If the create_file option is an absolute path and the file was within
+  it, de-taint. Otherwise check for taint. */
+
+  if (is_tainted(path))
+    if (ob->create_file == create_belowhome)
+      {
+      DEBUG(D_transport) debug_printf("de-tainting path '%s'\n", path);
+      path = string_copy_taint(path, FALSE);
+      }
+    else
+      goto tainted_ret_panic;
+
+  check_path = path;
+
   #ifdef SUPPORT_MAILDIR
   /* For a maildir delivery, ensure that all the relevant directories exist,
   and a maildirfolder file if necessary. */
@@ -3319,6 +3298,9 @@ put in the first address of a batch. */
 
 return FALSE;
 
+tainted_ret_panic:
+  addr->message = string_sprintf("Tainted '%s' (file or directory "
+      "name for %s transport) not permitted", path, tblock->name);
 ret_panic:
   addr->transport_return = PANIC;
   return FALSE;
index c8ad6f43fecfab27f4a0257ac8ac0751291113ab..4dfd09aeacbca3eaf4008856538cffdfa47211fc 100644 (file)
@@ -517,7 +517,7 @@ appendfile:
   directory_mode = 0700
   envelope_to_add
   escape_string = xyz
-  file = /home/${bless:$local_part}/inbox
+  file = /home/$local_part/inbox
   file_format = "From : appendfile"
   no_file_must_exist
   group = MAILGROUP
index b83e897cad4ff611f1d68a29ead0788d95eaa215..337dfa31a3d39253929cf213654ed0dd9092a55d 100644 (file)
@@ -35,7 +35,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   headers_add = \nMessage Headers:\n$message_headers\n\
                 \nRaw Message Headers:\n$message_headers_raw\n
index 396718f9839332dd1e530441b57e16fb1b036c82..c5ce9017f0d6956b1dd438acc105292120ef8a08 100644 (file)
@@ -27,7 +27,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
 
 # End
index 3ca2feb7a6483681d2419d62615e8108df711dd1..756c727e2f74c5e97f808a4b907a0fdd2d3ff1f7 100644 (file)
@@ -27,7 +27,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
 
 # End
index 0216aae14e3dac96435be9049e57bf3c17d495f7..eb5b2ec52ed7cd807037106363f0f865a797ee48 100644 (file)
@@ -27,7 +27,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
 
 
index e39d595630396c3036d051f8efdff27771fe6fca..aa1c4b7029f9768c985a27e70887412fcbd0048f 100644 (file)
@@ -27,7 +27,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
 
 
index 76f5bc4ac6e4e5f873d386ddb2af20b0a4ceeaef..a368b89f799fa36bdbc40372b2647ee6866301ee 100644 (file)
@@ -30,7 +30,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
 
 
index 23abbb240bdb5161d35a99ac08ee6299890c6e1a..c9eadae3134b01843e72071a2caee4a27fddf5a9 100644 (file)
@@ -94,7 +94,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   message_suffix =
   user = CALLER
 
index b1472da06cc78136a9c9d0cad077d5390264c21c..afd8144c59ae1bf14ac2ba2bee9d873c8638b386 100644 (file)
@@ -33,7 +33,7 @@ userforward:
   allow_filter
   local_parts = userx
   user = CALLER
-  file = DIR/aux-fixed/0015.filter.${bless:$local_part}
+  file = DIR/aux-fixed/0015.filter.userx
   local_part_prefix = *+
   local_part_prefix_optional
   pipe_transport = address_pipe
@@ -80,7 +80,8 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   headers_add = X-local_part: $local_part\n\
                 X-local_part_prefix: $local_part_prefix\n\
@@ -91,7 +92,8 @@ local_delivery_b:
   user = CALLER
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   use_bsmtp
   headers_add = X-local_part: $local_part\n\
index 9e190d8ebd0b74388f65535d0e4bf64e1c8990e1..f8cbb7cbb74f4e64108d0b6b85d5a81c0c04f208 100644 (file)
@@ -17,7 +17,7 @@ userforward:
   allow_filter
   user = CALLER
   local_parts = userx : CALLER
-  file = DIR/aux-fixed/0016.filter.${bless:$local_part}
+  file = DIR/aux-fixed/0016.filter.$local_part_data
   local_part_suffix = +*
   local_part_suffix_optional
   reply_transport = address_reply
@@ -43,7 +43,8 @@ local_delivery:
                X-local_part_suffix: $local_part_suffix\n\
                X-local_part_suffix_v: $local_part_suffix_v
   return_path_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
 
 address_reply:
   driver = autoreply
index 0150839b431e000c52b4acc987f08cf8c7155ef6..cf0ac21d265c4f06c7a35f2872f13a17e5d126b5 100644 (file)
@@ -84,7 +84,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 2228b280714f53ab8317ba0ca63b23112898ca32..cb41aa4224932a8ab22d23f952651e808cbc0e7c 100644 (file)
@@ -90,7 +90,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index c72c453a22b6a388fbd87b8580b87fd8123d856b..584e8c07d02aaaf8dba3db9080d4e65351f02b49 100644 (file)
@@ -232,7 +232,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2:
index fac5e12a5c5b6bdbb6f29235351ab0a34bea5e84..4b032f4fb11b62ca178c86c5f2bbcbbc86f35946 100644 (file)
@@ -86,7 +86,8 @@ dev_null:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index f2d987e1340e676bcf821633383261255ecaf6c8..c13245194a0cf8316bc4639956808bb2884cddc7 100644 (file)
@@ -52,7 +52,8 @@ dev_null:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index cc0c51c9b1d61ac37a1038a210184f5ccefad958..6407981b615a2dfe14e13526491ce7fd61f86d96 100644 (file)
@@ -54,7 +54,8 @@ dev_null:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index c2d0f01be93a7044f22a2872f452968aef721813..53e9357c0fec5e917300ac64dc041ab19f821158 100644 (file)
@@ -70,7 +70,8 @@ dev_null:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index caebac0ce573ee48ef00ae13b2f1a146c805d055..6ecf67501b69451671c1fb2085efaf40b012c0c4 100644 (file)
@@ -54,7 +54,8 @@ dev_null:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 8760be578735dbdb5806ae91b8c8333bf1bd2c40..8dac996ae63c1dddfdbcc2423e33d811ac3f38a1 100644 (file)
@@ -29,7 +29,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
 
 # End
index 644404d241182c1b9854bc68c85572a508530105..8af551b0c105e6d076952bcb87f5fc206c0509c7 100644 (file)
@@ -33,7 +33,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
 
 smtp:
index 6d02a44cd7fe9b95a81d5d622d473dd610064204..43eb7534aef22400862d58f6ebb02af7e2a989e7 100644 (file)
@@ -37,7 +37,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 send_to_server:
index c26f55364a793c83cc8c3989bf7a771561c11206..4a7f5cade6f0fc1f27a36944505dbfe099bc2329 100644 (file)
@@ -85,7 +85,8 @@ appendfile:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 30a3de2340a8d230ddd2e5a67ec4c7720c363040..746ed64a0dfcd44f7340b8d4a7102cedc29d0376 100644 (file)
@@ -27,7 +27,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "X-interface: $interface_address"
   return_path_add
   user = CALLER
index 0d601a8929b20256ffdb5418fb65eb97468b5015..e0bd3e2f3e8bb6f3854f299ab6c3ea8c32c34034 100644 (file)
@@ -52,7 +52,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 46229f59fa68e60f861108b58a477a2bd55bf08a..6b747a04587becdb47ad95ed72fbd7cc7b5d89a2 100644 (file)
@@ -38,7 +38,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 91d58f338d166cb17c1f39bf1418b1eab904ee85..27e7e61d493c4910bf452bab52c09dd0b3d656a1 100644 (file)
@@ -56,7 +56,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index c13a158179c9b513376f6c8d0af8f8d61dfc6f35..dc6b3d4b0674fdad2e006c7621c37d87c917c5ee 100644 (file)
@@ -47,7 +47,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 15e8df80faec0fd27bd6118477628dc53c615aa7..4fb293e10fcf5f41310abb6b4760bdd1b9788997 100644 (file)
@@ -32,7 +32,8 @@ begin transports
 local_delivery:
   driver = appendfile
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "X-size: $message_size\n\
                  X-body-size: $message_body_size\n\
                  X-body: $message_body\n\
index d11a120f1af04771c9d8b369d7ac9d825c77d36f..910d360d4935d8be3999acc03b28ac9939c8718a 100644 (file)
@@ -42,7 +42,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
 
 address_pipe:
index fd2574ea8e1f9b6c2f13807e15208731ad4e957d..6e0b0dbc8fbea3e13f9574958da66bd84743ea67 100644 (file)
@@ -34,7 +34,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 32c414aa13ec2518c5e4a98a555e78e1b94bf113..b4313ab9bfa4559a56ccb8800ee4c984acbac98d 100644 (file)
@@ -37,7 +37,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index a14fc3ddcaae62df0dbd3655d6cfaaf3d80f35dd..d5fca864cc59693a7df38431a06fcb6d58e166a6 100644 (file)
@@ -40,7 +40,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 426e7ed9813392bab0c256b0e326986d40df8df2..b8d0232a0cb92451bef1b0a4998e3105c8c34697 100644 (file)
@@ -33,7 +33,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
 
 
index 4d279d0abba553dddcf07da66fa0c6f867af58b2..7fcf7f01cdd918516f09648cd59552e28f5c566b 100644 (file)
@@ -32,7 +32,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index ed6e60878451461dd002f59cc437ecb0d09baa3c..5d7fc0fef5c739dc187b6c3d9c978db33d851129 100644 (file)
@@ -46,7 +46,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index e1e997b9aaaf864358ba7cb47e1acc9f5502e916..6fc5c72590ae59b47ec2c7becf99c7fc94d6d9eb 100644 (file)
@@ -53,7 +53,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
 
 
index 6788256736ec30bb3ee15bbab56561675bbff95c..79407fd3d1a9fbba253970980b229e400433a701 100644 (file)
@@ -40,7 +40,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
 
 
index 20227d416cf40a31fad844421c25b707f53f19f7..4b3e4807c00cb0bd14b9305156887862db5f9bc7 100644 (file)
@@ -41,7 +41,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index b07ffbdfd220871104af9305043f7927d6d02b0e..a4d99b6021065e5bdab9e6a35253343d4c7cea90 100644 (file)
@@ -26,7 +26,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/subdir/${bless:$local_part}
+  file = DIR/test-mail/subdir/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 8e9c08f806c97caffb5b25c0b5f5baadb14dc9d7..579d6d6db566ed3138595c9fab11d6225d7719ad 100644 (file)
@@ -27,7 +27,8 @@ local_delivery:
   no_create_directory
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/subdir/${bless:$local_part}
+  file = DIR/test-mail/subdir/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index a7a412ffa2dc27b2b90a988bc2e53d7ea189c551..14929091625529a9f9fcf3e1dab0a823b1eeaf49 100644 (file)
@@ -69,7 +69,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index a0f578f614e4f2f5ed1cc5d17db81ea0c86062c0..503ca99d0631e7cd40eed1938d1e3fd5e7c0cc35 100644 (file)
@@ -50,7 +50,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 2e020e01d20353c08eb46861dbd98b48783cdcfd..ad00193304f7245f5059f1c808f03724e81a332e 100644 (file)
@@ -28,7 +28,8 @@ local_delivery:
   debug_print = ">$h_X-one:<\n"
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index fca3e7b0daa9e80ed40410cde9407eda4bbac4f5..fefd0502c367f3dca42a1a363f5cc798719e35d9 100644 (file)
@@ -26,7 +26,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "Proto: $received_protocol"
   return_path_add
   user = CALLER
index 4ab79fce45df22f294ea0d9e88750ed3c7a06e44..d4ca616551514eaf7c375ccd1b16dba2957de1b1 100644 (file)
@@ -26,7 +26,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "Proto: $received_protocol"
   return_path_add
   user = CALLER
index f5dc6f2913032c1f134aa8252c2ee121d09845c7..52593ec95f6553e668d097bd96e57564f1e51e83 100644 (file)
@@ -30,7 +30,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 respond:
index 07698b5c0a0291ccac507ef9b51d217de35400c8..0ff7d5f4c840d2e5c25762564a32bcd297d0c49c 100644 (file)
@@ -42,7 +42,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = host_lookup_failed: $host_lookup_failed\n\
                 host_lookup_deferred: $host_lookup_deferred
   user = CALLER
index b1201f8709a7bc5871c380f3dba1646a1ad3c8f3..4b18a494fe287372d00332becc2a56c151d2db6c 100644 (file)
@@ -39,7 +39,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   quota = $h_quota
   quota_warn_threshold = $h_threshold
   QWM
@@ -47,14 +48,16 @@ appendfile:
 
 appendfile2:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   quota = $h_quota
   quota_warn_threshold = $h_threshold
   user = CALLER
 
 appendfile3:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}${if eq{$sender_address}{}{.bounce}}
+  file = DIR/test-mail/${local_part}${if eq{$sender_address}{}{.bounce}}
+  create_file = DIR/test-mail
   quota_warn_threshold = $h_threshold
   user = CALLER
   headers_add = X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
index 1eb519417f56e26a0968f648d74126421ba30c07..45365a7b7db4a3e50ea28eba90cdcd7f7491a305 100644 (file)
@@ -29,7 +29,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 495349d3fc46f3bd3569c533d01a3deb536032fb..3b08990ecd2fa5bf0db79ffc4cc29cc02557a208 100644 (file)
@@ -29,7 +29,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "${if def:h_tadd: {Added: by transport}}"
   headers_remove = "${if def::h_tadd:: {tadd}}"
   return_path_add
index e16b25eaaca3f105723c2c952fa1956fee79bc01..a1151378d9b77d3a639f9cf415e3def6c35edbaf 100644 (file)
@@ -84,7 +84,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index afe04a4c1c95bdbfc1e139061728c7f24437c809..547684ca88c51dfd10200362959af35674b4f2f8 100644 (file)
@@ -84,7 +84,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   current_directory = /
   user = CALLER
@@ -93,7 +94,8 @@ hackfree_local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   check_string =
   return_path_add
   user = CALLER
@@ -105,7 +107,8 @@ bsmtp_local_delivery:
   use_bsmtp
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
   current_directory = /
@@ -116,7 +119,8 @@ bsmtp_local_delivery_filtered:
   use_bsmtp
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
   user = CALLER
@@ -136,7 +140,8 @@ filtered_local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat"
   current_directory = /
@@ -146,7 +151,8 @@ mmdf_local_delivery:
   driver = appendfile
   check_string = "\1\1\1\1\n"
   escape_string = "\1\1\1\1 \n"
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   message_prefix = "\1\1\1\1\n"
   message_suffix = "\1\1\1\1\n"
   user = CALLER
index 30b1496ac876ac5d8c7b90f0568f5b74c7651673..c73eed924919be14556966baffd8ee267dce7226 100644 (file)
@@ -38,7 +38,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   file_format = "From       : local_delivery :\
                  MAIL       : bsmtp_local_delivery :\
                  \1\1\1\1\n : mmdf_local_delivery :\
@@ -52,7 +53,8 @@ bsmtp_local_delivery:
   use_bsmtp
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
@@ -60,7 +62,8 @@ mmdf_local_delivery:
   driver = appendfile
   check_string = "\1\1\1\1\n"
   escape_string = "\1\1\1\1 \n"
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   message_prefix = "\1\1\1\1\n"
   message_suffix = "\1\1\1\1\n"
   user = CALLER
index 547109ab54e1836156593a6553dfcce7ef5dd53e..0aa40257fdeb80b70435422c6a0e62d452757ebf 100644 (file)
@@ -53,7 +53,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 3cbebc856899a8306d68eb1d6d0e44cddd214f49..e65dae6fd0adbebf9740fa8d5d55ec1dd3e27014 100644 (file)
@@ -44,7 +44,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 851f12cc1cefea0bd164088d170896dff8bb4786..a6af688488a4606f8fd3e984e00207f7777ce7a5 100644 (file)
@@ -42,7 +42,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 5f6a80e8788e1247af39e1cbe8e6a8f55774316e..f904150f16d1e8b41a829a26a10f270aaa9ba4f3 100644 (file)
@@ -27,8 +27,8 @@ appendfile:
   driver = appendfile
   create_file = belowhome
   file = ${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.filelist}\
-         {${if match{$value}{^/}{}{DIR/}}$value}\
-         {DIR/test-mail/${bless:$local_part}}}
+               {${if match{$value}{^/}{}{DIR/}}$value}\
+               {DIR/test-mail/${bless:$local_part}}}
   user = CALLER
 
 # ----- Retry -----
index e4716f625e089b7a46f15f289b9fd1a2d1577bde..c6594fae769c3c2c756ce796ce22eebca3675975 100644 (file)
@@ -44,7 +44,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 3b4386b707ba207331359bda76cc07bb54012a81..49ac69507629875fba93350d91ec7b114c610cf1 100644 (file)
@@ -43,7 +43,8 @@ begin transports
 appendfile:
   driver = appendfile
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 2c0c573a36b09198ea7b8c52eb83d682762c50c1..5a30bc352c0de8c6a5c08ecb9e1e0897975b3b45 100644 (file)
@@ -45,7 +45,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 6916642e111aabec441e0defc088027bbaa8a54b..9e8d9f7ebf0e90288333fdf5a58a1554719cdc3e 100644 (file)
@@ -51,7 +51,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   headers_add = Added: $address_data
 
index 1f741cc0a2ee576720673c4b32f5574942fa5d44..afd803cc8f54a489342bc0cbd8e4eaf2e12b0f65 100644 (file)
@@ -41,7 +41,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 550971e40fc5d57742ccd41e4874278ca74485f7..78a67498dfd485e26245342edc2f8fc311a112ec 100644 (file)
@@ -59,7 +59,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 83dd03198dbde4cea380a9f181c6052ca2db5d09..226388e2ea59de7337d59ffda33d6a311a19cbf8 100644 (file)
@@ -37,7 +37,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index e4f78dca21cfe6275a38cc40d7d7e25fb0066005..9a2579c01fb14375e1088216244858a82664f241 100644 (file)
@@ -41,7 +41,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index c3df9a89e7d5660a4ad1312df3b1dd078b2716d6..087bd5540af2c72e7bb8bd14e52789517d9e8b80 100644 (file)
@@ -43,7 +43,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   headers_add = Address-Data: >$address_data<
 
index 2c9cdb88e5f43f0428b8bc0f9165f271bfad5c1b..8907bce5f13ed6948f783f02fe315f836863760a 100644 (file)
@@ -42,7 +42,8 @@ begin transports
 appendfile:
   driver = appendfile
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 1318e025c655ac9d36da63e69333a6ab25b5fa1e..63168ecd5a8610b69769bf5caef96cd3976a26c1 100644 (file)
@@ -49,7 +49,8 @@ smtp:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   quota = 20
   user = CALLER
 
index acc1003c91d160c1c0a0ceeab3440c54569990d7..f2687b68471ada11f0baca60086587513ffaa8f9 100644 (file)
@@ -63,7 +63,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index faab263aacb545690cb5a75e81aa63e370e0a6df..c12709698a23b9d04d6cf294d16ad0788c5be597 100644 (file)
@@ -30,14 +30,16 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   lock_interval = 1s
   lock_retries = 2
   user = CALLER
 
 local_delivery_fcntl:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   lock_interval = 1s
   lock_retries = 2
   no_use_lockfile
@@ -45,7 +47,8 @@ local_delivery_fcntl:
 
 local_delivery_fcntl_blocking:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   lock_fcntl_timeout = 2s
   lock_interval = 1s
   lock_retries = 2
index 01bdfaa62111b5af0ba33477bc51ac0c3c52b2ad..9a0b185b296357292dffb0afb7d3133a4d3a0e09 100644 (file)
@@ -54,7 +54,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 5aaa611830875106c5084cb251278b71f226a955..0c195c1f2c303427ea5e245a0b571815a8b53843 100644 (file)
@@ -81,7 +81,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 5661c5df46551babcf27459fedc2d3c3009331b2..3e6854a440beeb914ebe03399d34163eaeefce83 100644 (file)
@@ -45,7 +45,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 716ad5fa75d32a78deb79cb6c940361e307064bb..da8b73ea4e85bf442ce12c9e935e806442c4561c 100644 (file)
@@ -43,12 +43,14 @@ pipe:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 filtered_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   transport_filter = DIR/bin/fd -f
   user = CALLER
 
index 8527d30fab85e8501bd5be35270a7e8cb8fc0484..4887f9842f14e7d901934131be9e52f60d5e3b87 100644 (file)
@@ -40,7 +40,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 256080a506169d95850aed5cc7a4a3dd3cba712e..6fe5576641dce016a04a5e3622b5b8de73759441 100644 (file)
@@ -25,7 +25,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 0baf3450dfdb93156ebd73dd93efb4a3c968a263..56f3e7ee346a43b21f39758c5a81b3ac146e8eb9 100644 (file)
@@ -26,7 +26,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 5d50c9f3147a8dfd847e6b22daae59bb03eade39..cee79d91eb5bef021bbed788c2363b9a6cf5cf72 100644 (file)
@@ -28,7 +28,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 79dcde2363d600e9fae2d1de3cf8ec7601e13c24..59228e0a8363e9dbd27f911a92e91e0f40c64fe8 100644 (file)
@@ -30,7 +30,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 8a5c00e07d365e30f8149f8946bcda9ef063cb6a..43ef37023b6b2257140d01ad7f1ef1805c25d9ab 100644 (file)
@@ -28,7 +28,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = $local_part
 
index 7fcaf60630966fd90070bfc69c57a28fcad9a32e..a31e1496ad906cd753ace38b7b763887b39289cf 100644 (file)
@@ -28,7 +28,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index d80f383f533bd29b61e3e9cd78b2fba4cf5bfec3..dce05f28e5d9420644d13cb30b9e7c54ea8651d9 100644 (file)
@@ -29,7 +29,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 address_pipe:
index 48fe63bf112e1fde62cfd1ffe2ecb13fa9e7d56a..fb138bd2d8efca08665f0a02c7e15b5cca5c384e 100644 (file)
@@ -29,7 +29,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 address_pipe:
index 3158ac50287a308681f8268567a2073e21c0455e..eebf0d94be6d4aa869a47588b65b23ad498a4539 100644 (file)
@@ -37,7 +37,8 @@ begin transports
 local_delivery:
   driver = appendfile
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   headers_add = X-tpt-hdr: 1
   headers_add = ${if bool{false} {X-tpt-hdr: 2}}
index a3e045f21834937d4b2c2da540530ecb12720924..a8483f0bacde5becb071e98e8c7d3568f1b2f641 100644 (file)
@@ -35,7 +35,8 @@ begin transports
 local_delivery:
   driver = appendfile
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path = ${if eq{$return_path}{trakill@test.ex}{}fail}
   return_path_add
   user = CALLER
index ec8bf79578d10274f80c42ed3a31742a080e89be..75d8a15a9f6e1041fe09e8b453c2b8557252e874 100644 (file)
@@ -23,7 +23,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   quota = $h_quota
   quota_warn_threshold = $h_threshold
   user = CALLER
index 345a1813cb30c95c08315a3205821da6b4120852..198aedced8e7c553a1ebe7bf3c893d99304aac53 100644 (file)
@@ -24,7 +24,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = home: HOME=$home
   user = CALLER
 
index 7b335183e9336270d3aee3572bbeb65d25e18e69..06d3ea86d7c5e880742257e125d98bcb3914b634 100644 (file)
@@ -28,7 +28,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index dfe894ef89c22c8289e585b269a0e1ce9a0e31a2..9640ccf1cceb9a9c51c4a47e4a39997310afe2f0 100644 (file)
@@ -29,7 +29,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 pipe:
index 5498e2beeb4a39c9c9f5efea7de4620b3f94a6a7..b79e237b3b946dd61b7b81e47fa76b109023fb34 100644 (file)
@@ -52,7 +52,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 pipe:
index 3f2cc8c9618ccd40bf15121852ac0a6f8293d8d2..e5eced2d28363ece0de8e355dbf19b7eed9cd35b 100644 (file)
@@ -62,7 +62,8 @@ smtp:
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index d5c86caa5a97143d92e1d0a5ce86d722e0a4cb64..5d8d0f5f32aeed547848b8a6f26fa85910f28ad9 100644 (file)
@@ -26,7 +26,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index ff780c145d672076518eb8ad8b12f80f7ae4e9cd..eb15a515d08aa519c81e673bc8832815e6c3d478 100644 (file)
@@ -65,7 +65,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 autoreply:
index 2554e0a6c3f509e08568c26c01ef339165da4673..2961d4018c0eb37c455041e2e9a1d444f4f0ba40 100644 (file)
@@ -26,7 +26,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index c23722a3b7368837e379beb5a139fdebbacf9181..cb0946615865578ef3630501452a899b745ec232 100644 (file)
@@ -34,7 +34,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index b8bf04d290bc2e3031c364d9441569736275c08a..5062e08ff9025149a9c1abe290eb3715fbdc482c 100644 (file)
@@ -62,7 +62,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 autoreply:
index 4d63ddf84c15af3f4c0fbf03712847777d5c57b2..71b31acee18b39bd7bddec5176b360e87a3f43f2 100644 (file)
@@ -25,7 +25,8 @@ begin transports
 local_delivery:
   driver = appendfile
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index e19bd003e9bde3e8c227d34a04a4d92e206a693a..20789ef7cd8a6189a4b931ecb2bd0f5c2ed0db11 100644 (file)
@@ -23,7 +23,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   quota = 500
   no_quota_is_inclusive
   user = CALLER
index 483d05062a1693256404cb5a1afdc738d0d96450..ce3ef5e464ef43b763d2e160f3fa0c92d670671c 100644 (file)
@@ -34,7 +34,8 @@ local_delivery:
   driver = appendfile
   batch_max = 100
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   message_size_limit = 50
   user = CALLER
 
index abeaafcf1ab2dadfa9ae557a14198dc6e38d8e48..4d0ac7c89526d84df279d60824e226f465714846 100644 (file)
@@ -31,7 +31,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 pipe:
index 16032445bf4f0c3920589f8fdff5503a6e050410..46f1029efa86f2a2dabec5023b12348b711ac44b 100644 (file)
@@ -38,7 +38,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 69099691629e0c54c7cc8d04dd0185c940504932..23bed12674434247e3d204686cb360a5667ce5f9 100644 (file)
@@ -41,7 +41,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 92a2dce66b822b9b24eb5c0535a20d225bb54b20..3d6e8fda9023cf09bd9d050fb64cc951a56d45e8 100644 (file)
@@ -31,7 +31,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 688e0e98bd9863f43474d21dabaa7e0d04279997..d1e32eec6b6829f54a5e1fb635441d72a3570307 100644 (file)
@@ -25,7 +25,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index abc93e7ff95d010aa001d4df66f2d4fd6d619d42..12edc868b5d45358f150f303f8551ef7d1d7ebd4 100644 (file)
@@ -42,7 +42,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   headers_add = Address-Data: >$address_data<
 
index 3e5661ccba5e9e3969ae4bdb4d96f7f7fe160de1..209f6fc9d86536302374d17d8151d2e48da99001 100644 (file)
@@ -44,7 +44,8 @@ bsmtp_local_delivery:
   message_prefix = "HELO x.y.z\n"
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index f68b036bea75118afdab329fac9bcd6abc843e08..6ee7253c7c012ee15b252f14f0bdd480b66a3737 100644 (file)
@@ -57,7 +57,8 @@ smtp:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 8b8d74404da56265f1bf87b754da2c35f65bae7d..7cbc8c84a331084d19fddc774b8ac7bd33ca8369 100644 (file)
@@ -73,7 +73,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 8e5af4e580fba013c1ab97df65326e45f93237f2..79cf4c9cf82c2aa4e1aea443734a26c1ac9c0778 100644 (file)
@@ -26,7 +26,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 4ac979c0d7e54b78f0aaf5e11ed67b0d0e819437..0b2fbc097df6e21c5c4ca3116ce35f05e57245aa 100644 (file)
@@ -26,7 +26,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 91f74538afd933a0e4bd3cdf527e5c39bc42c00d..48d7b42c12570c59322f5e775c950edb1a1a5acd 100644 (file)
@@ -32,7 +32,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 autoreply:
index 56476a3d5e4e38b1f3aafbf780f9dd34c62858b7..2b42e9a06d9fd41de49b7e895effe321fa34594a 100644 (file)
@@ -42,7 +42,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index ff77339c71710ec4846fca85d60f43cf4fcd9485..d5a3760091cb3f04460fefd0358e96d72f6aab09 100644 (file)
@@ -45,7 +45,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index a778c2f6a3c7da5e63cc75ddd4e2232f52d4956a..61e2994eadcabf1c6af06541f8c60b4c764467f0 100644 (file)
@@ -44,7 +44,8 @@ smtp:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index f5be03e9dab85883393460829c82582618bb1da5..379545bf8d54b8dd96ffb755df189218575cb6fa 100644 (file)
@@ -47,7 +47,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 address_file:
index 08a67228ecdd461c41c3592bb7a3a6e840a58247..ecce422957848bbe7d71492bb884335b7bd16ed8 100644 (file)
@@ -57,7 +57,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = Port: $sender_host_port
   user = CALLER
 
index 67f21c0e17a1398994ff7eeba012421c4c357dc5..7bc9d18291ce609e59eafcfdd7323f4f0a1f1cf7 100644 (file)
@@ -51,13 +51,15 @@ begin transports
 
 local_delivery_rewrite:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_rewrite = a@test.ex a-rewrite@test.ex
   user = CALLER
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 smtp_rewrite:
index 11e4523ea1c2f8941bed5c86febf99bc430abfb7..22bb68edf4b1c1979b86efde6603b9a575420c35 100644 (file)
@@ -39,7 +39,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 054ab7d67e023124e93c632ab473b5043da66c6a..36d60f64211eda24f76ec197de942176d14b15a6 100644 (file)
@@ -39,7 +39,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 address_reply:
index 8939dc75ef431d1dedaab823e5185e3740a7efb2..0eb8f26039e176acb226bf4312d4030ecaac6a22 100644 (file)
@@ -49,7 +49,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 address_file:
index 62a192321c22daa5c6aca40cdbe2a1ee267ecd35..f75aaae1d397ee773b76b9986214334e519f2ce5 100644 (file)
@@ -90,7 +90,8 @@ begin transports
 local:
   driver = appendfile
   directory_mode = 3777
-  file = DIR/test-mail/subdir/${bless:$local_part}
+  file = DIR/test-mail/subdir/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 944c517eafcb6389e5b7d0ece5e99f866cdb7106..9e6ded492e04a9367fd93d857b2ab0033a00019f 100644 (file)
@@ -37,7 +37,8 @@ begin transports
 
 local:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 address_reply:
index d5e989c5bf99e0ea65546f3f92a03b2ff42e9edf..438acc2fb4591f07f2ae2386df1faf66d9496ff1 100644 (file)
@@ -59,7 +59,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 address_file:
index fe62bfddf1feaaa06bcd3e79734645710351312c..257475b87ee41b4f50c0178b641697092277c14d 100644 (file)
@@ -35,7 +35,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2:
index 5713106ac77d55446d1d0d6f9c82ce379c5109ae..42d88ab3252cc269c7487ef1b58a7e7163aff6b3 100644 (file)
@@ -42,7 +42,8 @@ begin transports
 
 t0:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t1:
index e48c69648c01f087d303e40c2eef189718de9751..0a54675393780444a62eead575f7a7fe9838dd29 100644 (file)
@@ -30,7 +30,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 25de1af2937289f9653fa971799cf746ecfe1b8c..fcdbe1fc62a512186764396e45fbf4ab869b7da3 100644 (file)
@@ -24,7 +24,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 257ea82da437d035cd9fba01477c93e8058f0870..775283e55db1bb527ca1ac30c17ed99008db158d 100644 (file)
@@ -14,7 +14,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 bad_return:
@@ -30,7 +31,8 @@ bad_uid:
 
 exp_fail:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   home_directory = ${if rhubarb
 
index 9e16d1db61572c911ac3f5c518beb0ce039af456..cc1ad5d0f6298900ff47ecf3d4d4c22ff97136fb 100644 (file)
@@ -15,7 +15,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
   quota = ${if eq{$local_part}{userx}{3}{10000}}
@@ -24,7 +25,8 @@ local_delivery:
 local_delivery2:
   driver = appendfile
   retry_use_local_part = false
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   quota = 3
   current_directory = /
index 42ea1b1f6b2e190b7b38c56743b49aecdbbf66e4..6558a5ef2090667f03450de4db9f020faed1cc78 100644 (file)
@@ -15,7 +15,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   envelope_to_add
   return_path_add
index e99d29f71be9ee323283bdd51d979e2f8d3bee39..4a52018cae48bed45a69990ecdda31cf6a970511 100644 (file)
@@ -14,7 +14,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # ----- Routers -----
index e09ff0e761ae0a190b2acb2d48f85dab72432df1..8b3441cd08517091c3f59a14ec41c95ce9e8a013 100644 (file)
@@ -15,7 +15,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   envelope_to_add
   return_path_add
index b9512dca1cd2f87cf4318fd305be51a4d66c84f7..6153af80e2328593edfe54a8b95954a01b9cc5a5 100644 (file)
@@ -14,7 +14,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # ----- Routers -----
index 461acfcf33cc60b2d87a6d1fcb8de8c688d7dd0a..c5b0bd84749079a1be2d6a6edabfcb2d931646b7 100644 (file)
@@ -14,7 +14,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${if eq{$address_data}{}{${bless:$local_part}}{$address_data}}
+  file = DIR/test-mail/${if eq{$address_data}{}{$local_part}{$address_data}}
+  create_file = DIR/test-mail
   user = CALLER
 
 # ----- Routers -----
index 10717bdcf49295f5a40419bd35e44b91091f7de5..f833889b2bba86629328a517b4ca73a99c0277f5 100644 (file)
@@ -18,7 +18,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # ----- Routers -----
index 3f737f392b6b0910fd4cd49a04d24d423982a3f5..bed03548ee773b784c2c1ab928a0cc499ae85084 100644 (file)
@@ -68,7 +68,8 @@ dev_null:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 00958b9a33c1c2f63ae63631f1060119577076d8..a34ea8aca9c17444ad25df1a41297df195d3a8d1 100644 (file)
@@ -26,7 +26,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   headers_add = interface-port: $interface_port\n\
                 received-port:  $received_port
index 7f40efb18dbeb07af7a1672d4dfe852237b1a5d7..62a5e60ca4b0156078cf2d8035634de84dcf803b 100644 (file)
@@ -37,12 +37,14 @@ t1:
 
 t2:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t3:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = root
 
 # ----- Retry -----
index 98f5660b7c05e14c77d92607323523b0a4749b12..8c76179a753b43892befd1779705a7be145904c0 100644 (file)
@@ -35,14 +35,16 @@ t1:
 t2:
   driver = appendfile
   batch_max = 100
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   envelope_to_add
   user = CALLER
 
 t3:
   driver = appendfile
   batch_max = 100
-  file = DIR/test-mail/${bless:$domain}
+  file = DIR/test-mail/$domain
+  create_file = DIR/test-mail
   envelope_to_add
   user = CALLER
 
index 56f50118b4623b11f94fca0ceefcc0273cc65824..44e40a528847a57e7f35a16f632d1e4da32acd11 100644 (file)
@@ -26,7 +26,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 6241af0032cac2404beed9fc031c54b3112be0e5..4ee779f39c74eebbe628086612792d119b658f5e 100644 (file)
@@ -25,7 +25,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index f4f3990e255de8364fa456af375542f945bfca81..546a93bc87a4ec5f3176a9feef1081d7bb9f3e9d 100644 (file)
@@ -32,7 +32,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 629f9c40d23c94c922865cd4599e38832754045c..a7ec0e5bad28a0d55e3dd1bcdfac4e5b9bd711f4 100644 (file)
@@ -30,7 +30,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   shadow_transport = t3
 
index b3c18f4fa670f031cc452afc24c09c850d33b456..c346012dfc54bc2f190104b346ac531aab79382f 100644 (file)
@@ -64,7 +64,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2:
index 81857eca489f83ecb4d3ccd7d8f3be8eeef91b0d..9e78a0c15c742d3e070db5b95ccb6dd65d1c9c58 100644 (file)
@@ -54,7 +54,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2:
index 0a49f221d16984ba771c57bd3b1de078e172dc25..0735c253637bd1458ef9a3f8fcb29f7cbf487c34 100644 (file)
@@ -29,13 +29,15 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   message_size_limit = $local_part
   user = CALLER
 
 bounce:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index a999c26426c6c13b45e1bcd86ec247a9004fabf1..9a2ac203a74131c429a936d7c37c81e5d524e785 100644 (file)
@@ -28,13 +28,15 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   quota = 5
   user = CALLER
 
 bounce:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index ec778a7fd5fe3a0c66ef7cfff57fd706f555f42d..b57794e073e2f8f5b488d8cd4fd6739625558cc8 100644 (file)
@@ -24,8 +24,10 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  directory = DIR/test-mail
-  directory_file = ${bless:$local_part}
+  directory = DIR/test-mail/subdir
+  create_directory
+  directory_file = $local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 65416e8b4c22a0044da5f53b75a7df15c532a02d..791fc9726d03771e902877a3c1da26079bbb2dda 100644 (file)
@@ -31,7 +31,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 address_file:
index e73eda67b9ba9461203a7662eee7341cf6bc770c..b063cdeb1a73ed99ea6050289eea653f2afd3c17 100644 (file)
@@ -42,7 +42,8 @@ pipe:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 3047764bba3cdb909cb1ce2df971377a33ce7e39..65da778c773cacc88e53f6f909cea38dcc073f18 100644 (file)
@@ -25,7 +25,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index a983e071a85af619159c599cbc8aa2c359ddf998..107fe96c1fae752385943c5fa7b657b50ed5df16 100644 (file)
@@ -38,7 +38,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 85b4f894acf29344763be89f1437635e573f7694..30f2576cf0edc84337bf7cbcab3c51e3ceeec332 100644 (file)
@@ -40,12 +40,14 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index b52a2e19556a96cd159dd169c431d275264f9d4e..ee5ffaf060571a45784dba88663fa6f538dfa81b 100644 (file)
@@ -28,7 +28,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index e126d8c7e86cf1d2581aef0683b50defad08e82a..ce43227f3cd4cf52222ce5af7672b80cd5923c4a 100644 (file)
@@ -29,7 +29,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 066292d1c0951d0e4adf924c4fbe6a9ac5a60d5c..385fc7017612b59320fdce52e6a92a46f6439bf6 100644 (file)
@@ -37,7 +37,8 @@ begin transports
 appendfile:
   driver = appendfile
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 5a99e9bd1eec8de9f5a25450a2f5b0feb0bd36d0..a1a7525ff4930ee6126c5cd1a71947fa31bcbe6f 100644 (file)
@@ -28,7 +28,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   envelope_to_add
 
index d3aa237e97c9c15a65a544bb06c598199f421778..1832263830e5a1ed06f5c6956494891b105959ba 100644 (file)
@@ -39,7 +39,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 939bbeaec53db9bdb26b741f136259d29efc0747..fa017ec3b5371c132e51f81633c938fb4b25c0b4 100644 (file)
@@ -28,7 +28,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   quota = 20
   user = CALLER
 
index 61a487775a3080e2eaeca558767cf22fd6a3530b..6e84faa2e11e01ff693d0a070c62e352c96b463a 100644 (file)
@@ -38,7 +38,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   envelope_to_add
 
index c4353bcff5c121fd5968542b5a4bc5f5205a008b..b61f52973debe8b8462b38ce8c7f4f41497b6bfc 100644 (file)
@@ -27,7 +27,8 @@ begin transports
 t1:
   driver = appendfile
   user = CALLER
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "\n\
                 TO: $h_to:\n\
                 --------------------------------\n\
index 1a37f4100825cf9c3f2914ff73ee357d253cd4e9..7d5d75a0d6ee15fc96c0c039ad3326aab8a043b5 100644 (file)
@@ -26,6 +26,7 @@ begin transports
 t1:
   driver = appendfile
   user = CALLER
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
 
 # End
index 0f9ef9f4b67b9ddb5a5f0fbeff4142e0cb35e985..8a3bb97a434c02d1274b799d8cae36683f46de86 100644 (file)
@@ -26,6 +26,7 @@ begin transports
 t1:
   driver = appendfile
   user = CALLER
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
 
 # End
index 4cb670206642bbf44914142925f0e375f88368dc..ef6b67f8c753f406d4db1fe7f5d3099940a819c4 100644 (file)
@@ -27,6 +27,7 @@ begin transports
 t1:
   driver = appendfile
   user = CALLER
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
 
 # End
index f24f02bbddd4e1f52d808275d89ab59363aa7f9a..c5a9c4b902c8b980c3184fc329473136fd2c4f77 100644 (file)
@@ -29,6 +29,7 @@ begin transports
 t1:
   driver = appendfile
   user = CALLER
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
 
 # End
index 5081b497e5b4ee5ee0c461843c31630a818f63ff..b94eac7c5548772050a1b08eb0255f0a812fcc5d 100644 (file)
@@ -30,7 +30,8 @@ t1:
 
 t2:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = X-shadowed:
   user = CALLER
 
index 34855e224b1f9063aa50a6a6f02e04dea1c550ab..1bd44fce720fcdd55f6ff9375a7d3f3cf0de1568 100644 (file)
@@ -52,7 +52,8 @@ t1:
 
 t2:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 1cae0254ce256be98279b2901e5a7521695d584d..81a3667d350a5c944513fcc1f8b14986647b87ae 100644 (file)
@@ -50,7 +50,8 @@ begin transports
 # Successful local transport
 ut1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}-u
+  file = DIR/test-mail/$local_part-u
+  create_file = DIR/test-mail
   user = CALLER
   return_path_add
   envelope_to_add
@@ -83,7 +84,8 @@ ut4:
 # Real delivery
 real:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   return_path_add
   envelope_to_add
index dce134ef7233af7b900920222e84070513d5cd3a..3a71bf341e654f78a2ed5f2505c565bd4fcf734a 100644 (file)
@@ -85,7 +85,8 @@ begin transports
 # Successful local transport
 ut1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}-u
+  file = DIR/test-mail/$local_part-u
+  create_file = DIR/test-mail
   user = CALLER
   return_path_add
   envelope_to_add
@@ -146,7 +147,8 @@ ut6:
 # Real delivery
 real:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   return_path_add
   envelope_to_add
index ba8c0aa6ceb07cc61cb3d93ec1e0ac657d86eb5d..c26ed4c098b9d2d9ce7d01f7dfee7c21ff8a73c1 100644 (file)
@@ -65,7 +65,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index a3d14231b42d53c85e7b5a1614c480a5bb467f2d..66a689e5e1cb831583d95cbb5e39846d501d2421 100644 (file)
@@ -36,7 +36,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 0bad1f7c2203b91b8eded20046d1226b8b13a7ba..42eb64ed3a60ee5b6b0b82783666256468850f6e 100644 (file)
@@ -43,7 +43,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 1a26375154edf2e07e3f93c50d788307f04a1056..44aff1cef7879eebf4b2164ea858f49a4bb6745e 100644 (file)
@@ -39,7 +39,8 @@ t1:
 
 t2:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 4d67fed7b4fc3de2ccffe8f12a16855016060d3e..878819db4cffccb13251249096dac729c4580969 100644 (file)
@@ -31,7 +31,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 983af9bd43d63a29401373a8c11d2e8ebfc6f872..d456df5f6ed8cf6d69a741be7f2aee30bd8fb851 100644 (file)
@@ -36,7 +36,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 7ec2e805fdea1ec21d3c0b2e5ba17b46289dcb6b..7ffc4290dd99e64902669b04051bdcea8f6f30fb 100644 (file)
@@ -27,7 +27,8 @@ begin transports
 t1:
   driver = appendfile
   user = CALLER
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   transport_filter = FILTER
 
 
index c1c91d51ff710e334d05bc44828918515fffbc2a..49d0df1baa80aa4e8fcb7a0572846c47bb57ef9d 100644 (file)
@@ -28,7 +28,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 02b537032124b57299cc21952dd0b8ec0a0a9890..fc0027a1e0b63ae5a6d7c5bdb280ee05d7a86007 100644 (file)
@@ -54,7 +54,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2:
index 542978c83df0c4e137c657dadc22c51d6126f600..4093620c34227769540bc75d0989203a1604604f 100644 (file)
@@ -35,7 +35,8 @@ t1:
 
 t2:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index af74310c8d9e8d3153106aec706a3f682f83581f..4f9e2890ba65670963a09256e2cdbb0e220200bf 100644 (file)
@@ -26,7 +26,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 75147a3639e19826f02fdb6cd6ad7731adbd4ebf..5ed0c828fd9cba5ca47688879fb32d85740dd5e6 100644 (file)
@@ -26,7 +26,8 @@ begin transports
 t1:
   driver = appendfile
   user = CALLER
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "\n\
                 FROM: $h_from:\n\
                 --------------------------------\n\
index 99c2608e1c7ae8eb21ccc9c9bfe33b4d0bf86e44..dab74a1af9e80c2b524e3238589091c9f84e209e 100644 (file)
@@ -26,7 +26,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_rewrite = *@*  abc@x.y.z
   user = CALLER
 
index b0bcb6548908fa7d753e326cbd3bf7dfef48bd47..bb2c414fe2212ab827ab41a337af5f7c8afc1881 100644 (file)
@@ -151,12 +151,13 @@ begin transports
 t1:
   driver = appendfile
   file = ${if eq{$address_file}{inbox} \
-              {DIR/test-mail/${bless:$local_part}} \
+              {DIR/test-mail/$local_part} \
               {${if eq{${substr_0_1:$address_file}}{/} \
                     {$address_file} \
                     {DIR/test-mail/$address_file} \
               }} \
          }
+  create_file = DIR/test-mail
   delivery_date_add
   envelope_to_add
   return_path_add
@@ -164,7 +165,8 @@ t1:
 
 t2:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   delivery_date_add
   envelope_to_add
   return_path_add
index c76363eb33e6b1e3b5a25fbc1e662e35d42f5123..706f08aeee16c5ff7df59f11504e37be03ac6627 100644 (file)
@@ -48,7 +48,8 @@ t1:
 
 t2:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   use_bsmtp
   AFFIX
index 01f1ccb7091f5ca6c52d904d046b2ad68b09deb9..6e6724b0ae41082c98de70c808c670ed8da608ee 100644 (file)
@@ -23,7 +23,8 @@ t1:
   driver = appendfile
   envelope_to_add
   use_bsmtp
-  file = DIR/test-mail/${bless:$sender_address_local_part}
+  file = DIR/test-mail/$sender_address_local_part
+  create_file = DIR/test-mail
   user = CALLER
   batch_max = 20000
 
index 7337a4012081214af8f68a261e197d8a3e3ac816..c89862a8212e9a27f52024755814617ec036d50f 100644 (file)
@@ -28,7 +28,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2:
index ca8ef3953f378b670fdf0c5103acda4f99b20767..5ae84b6d20b6c9db5758aef495c0a6035b6256e1 100644 (file)
@@ -43,7 +43,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 1c0f675da31d9b6de00972ac166a52d567bb34ca..ce9e78988fe5a5a64c0d6fb17b3011284aaae1cb 100644 (file)
@@ -27,7 +27,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 7ae6a2ad0139666b1c970cd063ae16cabd40f2a8..8d04b424288e50b26753d5e2d22031c0a0f51799 100644 (file)
@@ -32,7 +32,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2:
index 313aa14a6366100575249f910c8c3ebb188c5175..2c5514ed25bca65fd0e6cc040ccac177d13f28f4 100644 (file)
@@ -30,7 +30,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # ----- Retry -----
index 4918700f9c6f51f661814d5010f893d77002ccad..9b46c92b7fbce086c0cdb4f024ede4577484ea03 100644 (file)
@@ -29,7 +29,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 6f476e5002f63d26cf68bd6f0a2e72327c565a47..f7c3ba1805ef123852a008e826602bef3d6debd5 100644 (file)
@@ -43,7 +43,8 @@ t1:
 
 t2:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 0ac7758f8579e0a4e9a8bbe7ce471a91e1b406a9..a0df6c971bf21cc6d9368289cdb42e1e44d5aa90 100644 (file)
@@ -33,7 +33,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index d10d12bdd5ac87deb80394081f8ca1cd1929bacd..9b62e49bc18fe98a6be4c21eac9f2e5f78599c79 100644 (file)
@@ -42,7 +42,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index cdd6453dc20db9ec2e0777e7dd0ced6c5ef2747f..41b6da26bbc1832bfd80dac8eaa73c7cc90d8d76 100644 (file)
@@ -37,7 +37,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index e4711e049f324b575b7899e9dca71be2cccfbe2a..51adbd3f1266ce86e6c4ca0bb0dafb09969211fb 100644 (file)
@@ -54,7 +54,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 98ff7bf583f15651340a459055e9cca2f8dbef78..e428d45c34f0818ae5a61496d60984330b5a4486 100644 (file)
@@ -25,7 +25,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_rewrite = \N$^\N bogus@bogus fw
   user = CALLER
 
index 646f47afbb17fbdc403fe1ed2047664e410f649c..153f07cfafb459014e5ecc2662fffcde251c6286 100644 (file)
@@ -30,7 +30,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 8de0b83d923549e44d8412dd474bef1bc422a48b..0b4af9333b7de462b0dabad729e811a28f2bf90f 100644 (file)
@@ -25,7 +25,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index fb159a7832fa6e55e56e190537848466565482db..1ef4a78433c301d2cdeb04a7021fc929772227b1 100644 (file)
@@ -29,7 +29,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2:
index 589686a38d07447136aa0147b3d6a6a364634419..7a879288d7e69c76592bf9c7d51691de10c7a8b5 100644 (file)
@@ -76,7 +76,8 @@ t2:
 
 t3:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t4:
index 8819f6230b3ae0efa72f581ee7fcfb19a2ccdba6..490c29087942864ffc8f3e6cf3bafa97f2bd1a6e 100644 (file)
@@ -39,7 +39,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 74c41e72a8fd30c23dd7a2e823278f33349fc266..72e87c65191a2d91aeed63cdd40e2a0bcfda3d29 100644 (file)
@@ -39,7 +39,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index da39a89cabee25dfd4ad1ee59ffcec58b1b66a8c..bea7c5326ee56c80ceab266d23cf009e136f6cd6 100644 (file)
@@ -26,7 +26,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   quota = 1000
   MSIZE
index d24fca96c2a945dd12bd0566b702a3fa9d245011..c8bcf0fd2a4d13b878b55b05b58367de496d065b 100644 (file)
@@ -22,7 +22,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   transport_filter = /non/existent/file
 
index 580f6931e01daa721a5de20608751e6f1ea8a7c9..a7e0114da58c0cd6dce696733a60568ea880cef9 100644 (file)
@@ -33,7 +33,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2:
index 2457c40337d215162d78a9424fe42065d4db38f2..c04e52e94889e25bed91b2d0f703f00d6926a878 100644 (file)
@@ -25,7 +25,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index cc991b2a3e9a72cc5224b6814c05324900a39d44..e02695c976147171653022345c7624c043bfa434 100644 (file)
@@ -36,7 +36,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 2e499adf3959057e14f6c308ee407e4922d86436..44e5a7d5cd936a159b62f2a309ae8ec3413d7ca0 100644 (file)
@@ -37,7 +37,8 @@ begin transports
 
 t0:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t1:
index 9e86b54119803067838aacdd008f34f6dd50b6b9..bb09bfdb8c32167da3319ce495f2657fbe6c8b43 100644 (file)
@@ -30,7 +30,8 @@ begin transports
 
 t0:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   envelope_to_add
 
index a3143a0c7be817cfeabceb8c2151c99513e36b40..b38b0919d039be92f650fd2123d4f260b383c247 100644 (file)
@@ -29,7 +29,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2:
index f5e29e446777b92ce787ed9c94f4ec9910a7158b..301cf7818ceaabd171ab84f0184b655534ce960f 100644 (file)
@@ -31,7 +31,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 lmtp:
index 3842776a5eb215e40becac500ac13465285655c4..a6e14f58d74908709c22f9061f17e06f5367aaa5 100644 (file)
@@ -69,7 +69,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 290d5e68a8822734345e2bb08e98a94f8869df4c..82699fe05c25bde1057bed335afa322cfa274737 100644 (file)
@@ -16,7 +16,7 @@ r1:
   driver = redirect
   local_part_prefix = file-
   local_part_suffix = =*
-  data = DIR/test-mail/${bless:${substr_1:$local_part_suffix}}
+  data = DIR/test-mail/${substr_1:$local_part_suffix}
   file_transport = t1
 
 r2:
@@ -34,6 +34,7 @@ begin transports
 
 t1:
   driver = appendfile
+  create_file = DIR/test-mail
   envelope_to_add
   user = CALLER
   batch_max = 10
index 7960c064d7be0bf734c0f70fdc612f9480f88be0..864320339cf79cdddf461efc777f7f6c6674591f 100644 (file)
@@ -36,7 +36,8 @@ begin transports
 t1:
   driver = appendfile
   user = CALLER
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
 
 
 # End
index d526f7710beed69ffdc32dbc22c13b6b4e406d7d..50f144caabcdbd742088ee4b539ac4ec49a4aeee 100644 (file)
@@ -94,6 +94,7 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
index d5d2ffd577f4c9a4cb8d39d717d48133ccd1ccf6..02ba786b17a2052e1fb79b9b60a22c3e12748609 100644 (file)
@@ -26,6 +26,7 @@ begin transports
 t1:
   driver = appendfile
   user = CALLER
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
 
 # End
index 4692b22b1d1e561b1b6a505ca81b1223e02ada44..17281775b93a929ce3ec4340fe7ecba1c3250c34 100644 (file)
@@ -55,7 +55,8 @@ dev_null:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 984aceba9fd055151afe72ab69a4ba7941a45f8c..6ee678899ab61cd0217457866e4c7ab89ced11a9 100644 (file)
@@ -80,7 +80,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index d7c19f14cad161c0d6a057b09868eb6dea63c767..dc3d477dc91ec24d72f63a1ccb4b2edf52603d13 100644 (file)
@@ -40,7 +40,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2:
index 388c53fd0270e8b46eccce0d4c922866765aef80..d46b67a11000ecb167c43ba3f4d0a6c4ebca740c 100644 (file)
@@ -26,7 +26,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 439374e82052e208d1a16afe11ea06ff2ba88dd5..baab4f3af6748743ff12e302261fa489efb9be8c 100644 (file)
@@ -1,5 +1,7 @@
 # Exim test configuration 0593
 
+OPT=
+
 .include DIR/aux-var/std_conf_prefix
 
 
@@ -25,16 +27,17 @@ check_recipient:
 begin routers
 
 localuser:
-  driver = accept
-  check_local_user
-  transport = local_delivery
+  driver =     accept
+  transport =  local_delivery
+  errors_to =
 
 # ----- Transports -----
 
 begin transports
 
 local_delivery:
-  driver = appendfile
-  file = DIR/test-mail/$local_part
+  driver =     appendfile
+  file =       DIR/test-mail/$local_part
+  create_file =        OPT
 
 # End
index 58257e55eeed59822ceba5282629ab54856aed75..c2460801a97cd1b4310366b60980dd6a4849b7c1 100644 (file)
@@ -58,7 +58,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
index d78b8ba472e605aef2849d334b5d0b4a88434352..6388962dbff3420574d2699795eac944458e0f1e 100644 (file)
@@ -60,7 +60,8 @@ begin transports
 local_delivery:
   driver = appendfile
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   headers_add =        X-r1: <$r_r1>\nX-r2: <$r_r2>\nX-r3: <$r_r3>
 
index 2f658c4d5d6e65b3e9f6f3bbf70760e73249252b..0f342dd90698b756b19d97d99aaf24010dcdfe92 100644 (file)
@@ -37,7 +37,8 @@ begin transports
 
 appendfile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index da5b72f22bf9e1a86b9f32338bab207665a28712..b3174aabcc3749cd8e791c81a2ff1803f88f3b2a 100644 (file)
@@ -84,7 +84,8 @@ bad_tpt:
 
 tofile:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   event_action = ${acl {ev_log}}
 
index 2409f395ec4b19b2e6708c0e99065fe8edfb45f0..7775fc4b0a44604644f577f1136d1cc4aafb7950 100644 (file)
@@ -96,7 +96,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
index ed465ace40c7f17d7c29952b202ec5aa6291f8c2..a1f391613e8a5ec1abf80dc242ba5fce9c4acaf2 100644 (file)
@@ -87,7 +87,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
index 0310653593ec90960d84c99a163afa50c7a7b3f0..5bd5f2a4fc90ee35c9911fae6e6b27a7b162a22e 100644 (file)
@@ -74,7 +74,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
index 878f4145d331fa918b7ebc47540f04d6608c6749..9d564b9abfa8d66dcbdf242224cf96f7df10855e 100644 (file)
@@ -28,7 +28,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 2ddf2a888101babb3a29756ad41f6f798c0a742e..1d9a36c36ac4309179bce78449ae1142966fe2c1 100644 (file)
@@ -73,7 +73,8 @@ dev_null:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 6405a87254692305676df97f7d4a622916e3a30d..62eca9f846a980ec2639b006c590af372af2c2bd 100644 (file)
@@ -38,7 +38,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 send_to_server1:
index f2b49c7211b1fbee0d59c81ef391363ba095fbf2..b122e9cf1bac874f96274a64e5ef769b2c48fff4 100644 (file)
@@ -43,7 +43,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index cdb3d0fc25e1b0a819bb4e0526772c7b7c29cb5f..9a006fb157e00136f017e1ed67a504f0185e7c11 100644 (file)
@@ -44,7 +44,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 47f88e86511e0471fe38bb6105bdf17a6f2ddcab..c5263b80934bf105aaa4f903e817e13c40f8f8ee 100644 (file)
@@ -53,7 +53,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 64309442e69a3a09d527e9a949038fd4a7aeb9ec..b22360fe39542624889a0fc2e65828019d1f6116 100644 (file)
@@ -1,4 +1,4 @@
-# Exim test configuration 1110
+# Exim test configuration 2019
 
 .include DIR/aux-var/tls_conf_prefix
 
@@ -47,7 +47,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
 .ifdef _HAVE_GNUTLS
   headers_add = TLS: cipher=$tls_cipher peerdn/cn '${listextract {-1} {<, $tls_in_peerdn}}'
 .endif
index b98c8dc45f79e7a04fcaf1fdade8c2e0eb27dc1e..66f6606d2eae80ec4084b2f6b98b3bfbb000dce4 100644 (file)
@@ -51,7 +51,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index eadea0a8afca17f89e85c92820fda0e79f6efc9e..ebd846f3f0df930410c7905da028fd09d36dd56e 100644 (file)
@@ -45,7 +45,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 1b12a5ff5b256de8fb564a038051e591700a5434..4151171f46d196b57cfa96d8fec91ee3e061ff45 100644 (file)
@@ -54,7 +54,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index a549a9f770fadf988e92e086548a3ee721372942..8468098aa04e4f796e3fb54843e7875256c46115 100644 (file)
@@ -39,7 +39,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 47bb2d5d1dba92b288fd18855715b3e037b16bcf..d92a5b2acf0b49ad2898ba41faca2bc80e4d11fa 100644 (file)
@@ -53,7 +53,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index f9d1ab1bfc35d30c6e1bc0bc420bf6702de2ec76..27d23e571d3c5ce2a03375ad9a1f37648a93efea 100644 (file)
@@ -46,7 +46,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 6a322ff502f81aa00e7ae7ddc1fc76e0edf81465..6428ac61dbd6b8ad02a0728f0577d4935ab02020 100644 (file)
@@ -84,7 +84,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index ec7c0011fb21f70605a647605890d1c28d3509ff..11f6512250aa4cbfe90aeae06f8696f99af5847f 100644 (file)
@@ -52,7 +52,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_in_peerdn
   user = CALLER
 
index 926b09a57aa4da658f56f389c4940a90d3332656..fa76659096cd1a21733c2b395b3d16e6f62c0dfc 100644 (file)
@@ -42,7 +42,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 907ab9947357c73540fdc94e5caf08dca0aef273..5db97ecfb821e9feaf7fbcbaeec2f1037ac0a62c 100644 (file)
@@ -61,7 +61,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 6ae1514e9ec3848e74620c1c99157b519f275232..ce86946e31bb00c4cb695f17b720af3eb1928d05 100644 (file)
@@ -94,7 +94,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 17d5ff2d1b1e54fed38e80e5efaa8b1738caaff4..1e5a1768cf9b3147ed7dacc4f9be8eb9bc8924ee 100644 (file)
@@ -52,7 +52,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_in_peerdn
   user = CALLER
 
index 05dd10f648ca32c993f9dda210e95735ee7d8d33..4a080d824081ca73ce4e17f823f79669be1a118a 100644 (file)
@@ -45,7 +45,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 7329e28d1443f8c7a39f66b3983a090d6b1e14cf..3a0614d8e914255424a8204973821e74ca557e9f 100644 (file)
@@ -55,7 +55,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 9fa4fbf5a3e1c03f03b0a68d8fa100f8afa3abc9..dda9094a9da6d2d27e4d3b4a6747de6697f729da 100644 (file)
@@ -40,7 +40,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 3f8f4fb629d57a1f0ca1da994aed56c4e694c9c1..8b0c72d917ada0260c94587637aeddcd30214836 100644 (file)
@@ -67,7 +67,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 remote_delivery:
index d672ad4931880377ed819f0291d1210f680b1333..c21a0e1299e6b993f778711c9b3b8e735566cb59 100644 (file)
@@ -35,7 +35,8 @@ begin transports
 local_delivery:
   driver = appendfile
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 46b7d69ddc22e533709da38bf00ceaad6f54cb6e..328e8460dbac2283c575cbe6838ca87741a622e2 100644 (file)
@@ -77,7 +77,8 @@ begin transports
 local_delivery:
   driver = appendfile
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 smtp:
index d94e70d7c2ee21911485b0462214ea2763cc9c33..d5a4ad1c22d27a6797ffe0b66ff1d45231c0b461 100644 (file)
@@ -151,7 +151,8 @@ appendfile:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 5d59e6dee9efcd499cc46f193418182c4f67d370..327308591abb0dfa40f9e9ed1244c4a1f4fa2936 100644 (file)
@@ -51,7 +51,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 7de4a6dd58e4f57a4facb260ae628fefd27b6d5a..66d9affbee5b02263b9906a6082edd422b78306b 100644 (file)
@@ -68,7 +68,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
 
 # End
index b50220887324b68bbcc412b0275b6e4fc6644a54..852a27c6836b0c635ffb8808801fb43c670e6696 100644 (file)
@@ -87,7 +87,8 @@ dev_null:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index f453873cb01eb4a66e35fd167846bcf310a87220..8303f28b9c79cbcca4314dad0a04fa499a3eede6 100644 (file)
@@ -61,7 +61,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index e4d02b74b2df3cd3e74123fb04ad5ebd1b0b5640..1951dd85d7004c79f95fca0a1742c02f22967fce 100644 (file)
@@ -59,7 +59,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 159a55376dd0129262923517d4d0b19229568a72..b793a4f36aeb9f9e83161217672c1ccc89c03352 100644 (file)
@@ -57,7 +57,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 75385a029bca552d78cd5007949de74e50ad19b1..93b5fa1eca1b49fce9e99d58cf666a2a3a848ab3 100644 (file)
@@ -55,7 +55,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 2419dece46e6eb6220bc0535c2e59ab7e0f73eef..5cf34fa20e8fca59edd4901cd82c2c1ffa6645f2 100644 (file)
@@ -102,7 +102,8 @@ appendfile:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 4a8d38aaef63f3e07faa073e3c936ab9a8428694..599f3e50dd95e7104f83a6339b676892647e6188 100644 (file)
@@ -95,7 +95,8 @@ t2:
 
 file:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index 397e4e94de13bc99f54f0164f699156013f00275..74faec2cfd12ed5e13dc144e89640fff1bfd71bf 100644 (file)
@@ -88,7 +88,8 @@ t1:
 
 file:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index d80aaa8f1febcc436cb958ae445b05745b2d3539..81afa5f2debea22c2c956252bc16e9f7d174a1ca 100644 (file)
@@ -52,7 +52,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index cf124eccf81cd1497464be36b3088b491e8f42a7..d9a12a36826b38fcf6d1dd0e0ddea773d70e1f1a 100644 (file)
@@ -46,7 +46,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index a2c45a327d78a2e698d8fa368848cf3bc1e4b06e..376cea5bd2840e62f17101576d1760f9165d9f68 100644 (file)
@@ -116,7 +116,8 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
index 0448883142eeb138f2125a938f71ce5410f4320f..a5e823a5670c061e1c78a529d27cb45333af0c42 100644 (file)
@@ -107,7 +107,8 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
index 07feb488b604a152fd294ace0763bdd54529ba1f..d146ecfdfa598e84b4e8170e25f4ea35030fab02 100644 (file)
@@ -106,7 +106,8 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
index 1f9d75b80773d38e29a8ff243aec3c15e793343e..bb980c03717fafa8bbc6384df2f85b7111e049f2 100644 (file)
@@ -78,7 +78,8 @@ send_to_server:
 
 file:
   driver =     appendfile
-  file =       DIR/test-mail/${bless:$local_part}
+  file =       DIR/test-mail/$local_part
+  create_file =        DIR/test-mail
   user =       CALLER
 
 # End
index a5b7f2cd05927dd95fd2a2b2d08554e77ce690e9..040cd117c7bc6e006076f2812e134c7ce3f2ca19 100644 (file)
@@ -107,7 +107,8 @@ send_to_server:
 
 file:
   driver =     appendfile
-  file =       DIR/test-mail/${bless:$local_part}
+  file =       DIR/test-mail/$local_part
+  create_file =        DIR/test-mail
   user =       CALLER
 
 # End
index 8c5864b9a5f48a38017d4d80bead453e72ff637b..8cffd65cfb505efd320914164b23ee04562165db 100644 (file)
@@ -78,7 +78,8 @@ begin transports
 
 tfile:
   driver =     appendfile
-  file =       DIR/test-mail/${bless:$local_part}
+  file =       DIR/test-mail/$local_part
+  create_file =        DIR/test-mail
   user =       CALLER
 
 tsmtp:
index 9f1058fb1447f97fc31ee48d90a971af378e7e6b..e045d5a1409ed8929cde8a10a7ffb33c6a4cb30f 100644 (file)
@@ -59,7 +59,8 @@ begin transports
 
 tfile:
   driver =     appendfile
-  file =       DIR/test-mail/${bless:$local_part}
+  file =       DIR/test-mail/$local_part
+  create_file =        DIR/test-mail
   user =       CALLER
 
 tsmtp:
index ad115c9623b0b8fd588ac47199b6b5eddaa1787c..effc845a52db89acb5527390ebbcfa449425406b 100644 (file)
@@ -86,7 +86,8 @@ forwarded_external:
 
 appendfile:
   driver =     appendfile
-  file =       DIR/test-mail/${bless:$local_part}
+  file =       DIR/test-mail/$local_part
+  create_file =        DIR/test-mail
   user =       CALLER
 
 # ----- Retry -----
index 04cc37082863b1f45da3d80bc99ff28a03d07144..d3b8422226a38a886c5b3293a7f91c6e6a93ebc7 100644 (file)
@@ -52,7 +52,8 @@ smtp:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 5aa96819fa7b70c5126a5e40a8b4b87c1007a870..76c0149b888d56c3db4fa92f93dc12d63ff47985 100644 (file)
@@ -24,14 +24,16 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  directory = DIR/test-mail/${bless:$local_part}
+  directory = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   maildir_format
   quota = 1.5K
   user = CALLER
 
 local_delivery2:
   driver = appendfile
-  directory = DIR/test-mail/${bless:$local_part}/
+  directory = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   maildir_format
   quota = 1.5K
   user = CALLER
index e5a7ef36280a5d9eb822a86e9547a4681cd193e5..1d7d16302b6a1fdd738238cf150b499dd689a021 100644 (file)
@@ -27,7 +27,8 @@ begin transports
 
 t1:
   driver = appendfile
-  directory = DIR/test-mail/${bless:$local_part}
+  directory = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   maildir_format
   maildir_use_size_file
index 17cba3c99d8d4379f9e9c78ceb0e7319d47e59b8..1e6e86f25940bc5338b1b13eeda4163011ea58c8 100644 (file)
@@ -24,7 +24,8 @@ begin transports
 
 t1:
   driver = appendfile
-  directory = DIR/test-mail/${bless:$local_part}
+  directory = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   maildir_format
   maildir_use_size_file
index 7929b406fce3f9cf6599b7f99a5b91cbe886e14e..877b9b7c37d64d674a826c05ecb8e81421ff92a0 100644 (file)
@@ -27,7 +27,8 @@ begin transports
 
 t1:
   driver = appendfile
-  directory = DIR/test-mail/${bless:$local_part}
+  directory = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   maildir_format
   maildir_use_size_file
index 1e904d4885516c995e2eafc2fa614eeb7f2bfce8..43b8b91de432446d46797b0a09759edd1a348f16 100644 (file)
@@ -27,7 +27,8 @@ begin transports
 
 t1:
   driver = appendfile
-  directory = DIR/test-mail/${bless:$local_part}
+  directory = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   maildir_format
   mailbox_size = 100K
index af6220121d2503ff067425b2166629ed5dee6970..832f0d7871c98d424b7baa4b0019d41743d45f26 100644 (file)
@@ -32,7 +32,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   file_format = "From       : local_delivery :\
                  *mbx*\r\n  : mbx_local_delivery :\
                  tpmissing  : tpmissing"
@@ -45,7 +46,8 @@ bsmtp_local_delivery:
   use_bsmtp
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
@@ -54,7 +56,8 @@ mbx_local_delivery:
   check_string =
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   mbx_format
   message_prefix =
   return_path_add
index 1002009f5ab5e7ce05b3631fd0da163dd1325771..542d9ab7663624198eac69a64fb098984763b8fd 100644 (file)
@@ -35,7 +35,8 @@ local_delivery:
   envelope_to_add
   headers_add = X-Recipient: local_part=$local_part domain=$domain\n\
                 X-Home: $home
-  file = DIR/test-mail/${if eq{$sender_address}{}{copied}{${bless:$h_mailbox:}}}
+  file = DIR/test-mail/${if eq{$sender_address}{}{copied}{$h_mailbox:}}
+  create_file = DIR/test-mail
   user = CALLER
 
 lmtp:
index d30bc353335fa6317d5df021908b750d306264c7..03f1279217fa5b280d9890eec277d7154bbb7294 100644 (file)
@@ -36,7 +36,8 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   return_path_add
   user = CALLER
 
index 2af73f24419cdc107f4ef376082accf8e46f5218..a94c5b13a92120198870695ad372dc6c7f9819d2 100644 (file)
@@ -34,7 +34,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 7a1f943a6873de99f2ff0cb75422d8da24dc8cf2..64e579d37044f204d328bb785ebaec8e2be25275 100644 (file)
@@ -27,7 +27,8 @@ begin transports
 
 userx_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   message_suffix = "$address_data\n"
   user = CALLER
 
index a6812213bc5dc07a95c61dc106ae33e26eba3a65..4fb15c351ae6fc4ea5258fff40a19e1a3c3c2c04 100644 (file)
@@ -64,7 +64,8 @@ null:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 9465cfcebeba718f87e0ece03ca9155e1f0f1913..61f3748f3a65ce74adc923879df256f8d4b39de4 100644 (file)
@@ -14,7 +14,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${if eq{$address_data}{}{${bless:$local_part}}{$address_data}}
+  file = DIR/test-mail/${if eq{$address_data}{}{$local_part}{$address_data}}
+  create_file = DIR/test-mail
   user = CALLER
 
 # ----- Routers -----
index 91dc4275d3fd9d9246f38d95e09e9df45fe2458c..97894d1cde50b1275e5aadd5ec6d8d6f08bfdba7 100644 (file)
@@ -45,7 +45,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # ----- Routers -----
index 7526b9cc40b7f4575cddbee9e7c3527d54516939..6d1559e0113e76789a78046e0f26d7a0bd92121f 100644 (file)
@@ -66,7 +66,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 7526b9cc40b7f4575cddbee9e7c3527d54516939..6d1559e0113e76789a78046e0f26d7a0bd92121f 100644 (file)
@@ -66,7 +66,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 09c81ffe90fbb8608dca0b3b8256b8a7718a7fc5..657c726aa3e31f12ffdd1d8148146646fead2d46 100644 (file)
@@ -85,7 +85,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index c484282327f637ced7361748ec4d591d8d7483f3..a5637bc8359a545597d878a630c0862f59edb45a 100644 (file)
@@ -65,7 +65,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 0e5e27b853f65d25f7298e242285eead7a209089..75adc098e6555833f2df68a28a3d68fe77e3d7a8 100644 (file)
@@ -83,7 +83,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 9ced25da422ac8171ca64a352b31593197d8aaa4..f686ef014984003571a3043ef0389b38b1efdda8 100644 (file)
@@ -95,7 +95,8 @@ remote_delivery:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 325ac885b58449000d21bbea01acce92e1e9085f..d4bedac51162022357eb5a240be393e6f4411d77 100644 (file)
@@ -96,7 +96,8 @@ remote_delivery:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 88c2298023687fe7ae5501e3eb7a7a4ce46ce767..edebaf8c0ecf2537fb1f3753280fe7cf95a40412 100644 (file)
@@ -92,7 +92,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index 5dcbcb5bb0758366e029609ae0bb75aef6ee1b52..ecf95436b004408e4018db42731f69646a33e8ed 100644 (file)
@@ -93,7 +93,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
index ec4306b4757efc590523b2d58d06e6700d17832c..bce0aebd4ce4df7bc8948b93ce261dc7ebb57c61 100644 (file)
@@ -32,7 +32,8 @@ scan:
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 # End
index ba5a1687f6366f10a56d5b7df04d048c7f24af39..58c8b4036a03603283ebcc3e8ec469ebba4225fb 100644 (file)
@@ -28,7 +28,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 
index 0b54c9675a4829efd3bfb454563d86bd0da368db..081c24632e3e23a13a81e1d9357186731037927b 100644 (file)
@@ -42,7 +42,8 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   headers_add = ${if eq {$local_scan_data}{}{}{LSD: $local_scan_data}}
 
index ed83ed3de5a3d3620b08c7d56bb29632aa5d4cd2..e0af263fbdefd786536b6a189f5c72ebab22164c 100644 (file)
@@ -30,7 +30,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   headers_add = X-lsd: >$local_scan_data<
 
index df62c6c9fc1a7ec6dd7885dada1c69f2d24319b8..140bddebe1c38978574fcce53418e87f6630fb01 100644 (file)
@@ -2,4 +2,4 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=all T=local_delivery
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@test.ex R=all T=local_delivery defer (EEE): File exists: while renaming TESTSUITE/test-mail/temp.pppp.the.local.host.name as TESTSUITE/test-mail/userx
+1999-03-02 09:44:33 10HmaY-0005vi-00 == userx@test.ex R=all T=local_delivery defer (EEE): File exists: while renaming TESTSUITE/test-mail/subdir/temp.pppp.the.local.host.name as TESTSUITE/test-mail/subdir/userx
index f3ab6ea125b91e74f09b07f31265314950d88f40..de70c2806a7dcbcd200510b104c05bde1368716c 100644 (file)
@@ -1,2 +1,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted
+1999-03-02 09:44:33 10HmaX-0005vi-00 == fred@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/fred' (file or directory name for local_delivery transport) not permitted
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone@some.domain U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 == bill@the.local.host.name R=localuser T=local_delivery defer (EEE): Permission denied: creating lock file hitching post TESTSUITE/test-mail/bill.lock.test.ex.dddddddd.pppppppp (euid=EXIM_UID egid=EXIM_GID)
+1999-03-02 09:44:33 10HmaY-0005vi-00 ** bill@the.local.host.name: retry timeout exceeded
+1999-03-02 09:44:33 10HmaY-0005vi-00 bill@the.local.host.name: error ignored
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/mail/0318.subdir/userx b/test/mail/0318.subdir/userx
new file mode 100644 (file)
index 0000000..6f77ef9
--- /dev/null
@@ -0,0 +1,9 @@
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+       (envelope-from <CALLER@test.ex>)
+       id 10HmaX-0005vi-00
+       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is the first message.
diff --git a/test/mail/0318.userx b/test/mail/0318.userx
deleted file mode 100644 (file)
index 6f77ef9..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-Received: from CALLER by the.local.host.name with local (Exim x.yz)
-       (envelope-from <CALLER@test.ex>)
-       id 10HmaX-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
-From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-
-This is the first message.
index 540b683513b209b427136f292b61956ad99e60de..fa93f2509f82f8ef8b3d80bc809d03ad985ebde6 100644 (file)
@@ -1,2 +1,2 @@
 1999-03-02 09:44:33 Received from someone@some.domain U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 CALLER@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted
+1999-03-02 09:44:33 fred@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/fred' (file or directory name for local_delivery transport) not permitted
index 540b683513b209b427136f292b61956ad99e60de..fa93f2509f82f8ef8b3d80bc809d03ad985ebde6 100644 (file)
@@ -1,2 +1,2 @@
 1999-03-02 09:44:33 Received from someone@some.domain U=CALLER P=local-smtp S=sss
-1999-03-02 09:44:33 CALLER@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted
+1999-03-02 09:44:33 fred@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/fred' (file or directory name for local_delivery transport) not permitted
index af4f4711864fd8f97ca24237b73a0543e9aff5c3..c91120311d45b9ae7610daebc224ce2fa0de81f6 100644 (file)
@@ -1 +1 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted
+1999-03-02 09:44:33 10HmaX-0005vi-00 == fred@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/fred' (file or directory name for local_delivery transport) not permitted
index 858617957572437c3da31bb4f33a4b54c400fcaa..6050411ed7eca99756e5dfa8a3b53f1dd4436b95 100755 (executable)
@@ -749,7 +749,7 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/remote delivery process \d+ ended/remote delivery process pppp ended/;
 
   # Pid in temp file in appendfile transport
-  s"test-mail/temp\.\d+\."test-mail/temp.pppp.";
+  s"test-mail/(subdir/)?temp\K\.\d+\.".pppp.";
 
   # Optional pid in log lines
   s/^(\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d)(\.\d{3}|)(\s[+-]\d{4}|)(\s\[\d+\])/
index 54ca506ccd32bb44602c55477ee4a8c6fc8dca6d..81a1b4c0351e041be2bef223cf7553953682dce3 100644 (file)
@@ -1,7 +1,19 @@
 # tainted data for appendfile file option
+#
+# This should trap
 exim -bs -odi
 mail from:someone@some.domain
-rcpt to:CALLER@HOSTNAME
+rcpt to:fred@HOSTNAME
+data
+.
+quit
+****
+#
+# taint trap defated by using create_file
+# goes on to fail on perms
+exim -bs -odi -DOPT=DIR/test-mail
+mail from:someone@some.domain
+rcpt to:bill@HOSTNAME
 data
 .
 quit
index ddf364bcbd6de1b0414c047310643312c958e557..441422371b99b9708f71d1b5f9fa91058eb15c35 100644 (file)
@@ -603,7 +603,7 @@ LOG: H=[8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: p
 >>> processing "accept" (TESTSUITE/test-config 85)
 >>> check acl = TESTSUITE/aux-fixed/0023.acl1
 >>>  read ACL from file TESTSUITE/aux-fixed/0023.acl1
->>>  processing "accept" (TESTSUITE/test-config 271)
+>>>  processing "accept" (TESTSUITE/test-config 272)
 >>>  check domains = y
 >>> y in "y"? yes (matched "y")
 >>>  check local_parts = x
@@ -616,7 +616,7 @@ LOG: H=[8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: p
 >>> processing "accept" (TESTSUITE/test-config 85)
 >>> check acl = TESTSUITE/aux-fixed/0023.acl1
 >>>  using ACL "TESTSUITE/aux-fixed/0023.acl1"
->>>  processing "accept" (TESTSUITE/test-config 271)
+>>>  processing "accept" (TESTSUITE/test-config 272)
 >>>  check domains = y
 >>> y in "y"? yes (matched "y")
 >>>  check local_parts = x
@@ -630,7 +630,7 @@ LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x1@y>
 >>> processing "accept" (TESTSUITE/test-config 85)
 >>> check acl = TESTSUITE/aux-fixed/0023.acl1
 >>>  using ACL "TESTSUITE/aux-fixed/0023.acl1"
->>>  processing "accept" (TESTSUITE/test-config 271)
+>>>  processing "accept" (TESTSUITE/test-config 272)
 >>>  check domains = y
 >>> y in "y"? yes (matched "y")
 >>>  check local_parts = x
@@ -1344,7 +1344,7 @@ LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferr
 >>> processing "accept" (TESTSUITE/test-config 226)
 >>> check !acl = TESTSUITE/aux-fixed/0023.acl2
 >>>  read ACL from file TESTSUITE/aux-fixed/0023.acl2
->>>  processing "accept" (TESTSUITE/test-config 271)
+>>>  processing "accept" (TESTSUITE/test-config 272)
 >>>  check domains = b
 >>> y in "b"? no (end of list)
 >>>  accept: condition test failed in ACL "TESTSUITE/aux-fixed/0023.acl2"
@@ -1355,7 +1355,7 @@ LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferr
 >>> processing "accept" (TESTSUITE/test-config 226)
 >>> check !acl = TESTSUITE/aux-fixed/0023.acl2
 >>>  using ACL "TESTSUITE/aux-fixed/0023.acl2"
->>>  processing "accept" (TESTSUITE/test-config 271)
+>>>  processing "accept" (TESTSUITE/test-config 272)
 >>>  check domains = b
 >>> b in "b"? yes (matched "b")
 >>>  check local_parts = a
index be1f27bd68b2e491993c0d8c5b1a7eccfd02afdf..e1dfdf664264f346fe0cbdd87cc9e86966d58894 100644 (file)
@@ -6,7 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> processing "accept" (TESTSUITE/test-config 60)
+>>> processing "accept" (TESTSUITE/test-config 61)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
@@ -34,7 +34,7 @@ LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> processing "accept" (TESTSUITE/test-config 60)
+>>> processing "accept" (TESTSUITE/test-config 61)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
index 2fb24dd166f9f7f40005f59d50c6fe9002977e0f..5d7deb7d839b89b6f911df5d7555686a22202df6 100644 (file)
@@ -7,7 +7,7 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
->>> processing "accept" (TESTSUITE/test-config 46)
+>>> processing "accept" (TESTSUITE/test-config 47)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -18,7 +18,7 @@
 >>> userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
->>> processing "accept" (TESTSUITE/test-config 46)
+>>> processing "accept" (TESTSUITE/test-config 47)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -29,7 +29,7 @@
 >>> junkjunk in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for junkjunk@test.ex H=[1.1.1.1]
->>> processing "accept" (TESTSUITE/test-config 46)
+>>> processing "accept" (TESTSUITE/test-config 47)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
index 4e0f4b6df7a23d7e5c8c406f4610cbb154d9aee7..0585da344634d5981f75c71574e3c1c8d968d923 100644 (file)
@@ -17,6 +17,7 @@ appendfile: mode=600 notify_comsat=0 quota=52428800 warning=41%
   message_suffix=\n
   maildir_use_size_file=no
   locking by lockfile fcntl 
+de-tainting path 'TESTSUITE/test-mail/userx'
 lock name: TESTSUITE/test-mail/userx.lock
 hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp
 lock file created
index 9f53887c728c3f6bf40da6efa5c95a3cca524e96..f625344ebdcd3619b13af016e40e9ce5e7b237f5 100644 (file)
@@ -38,15 +38,15 @@ check local_parts = 1
 1 in "1"? yes (matched "1")
 check acl = TESTSUITE/aux-fixed/0386.acl1
  read ACL from file TESTSUITE/aux-fixed/0386.acl1
- processing "accept" (TESTSUITE/test-config 43)
+ processing "accept" (TESTSUITE/test-config 44)
  check hosts = :
 host in ":"? no (end of list)
  accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
- processing "deny" (TESTSUITE/test-config 43)
+ processing "deny" (TESTSUITE/test-config 44)
  check local_parts = ^.*[@%!/|]
 1 in "^.*[@%!/|]"? no (end of list)
  deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
- processing "require" (TESTSUITE/test-config 43)
+ processing "require" (TESTSUITE/test-config 44)
  l_message: Invalid sender
    message: Couldn't verify the sender
  check verify = sender/defer_ok
@@ -72,7 +72,7 @@ routed by r1 router
  ----------- end verify ------------
  sender x@y verified ok
  require: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
- processing "deny" (TESTSUITE/test-config 43)
+ processing "deny" (TESTSUITE/test-config 44)
    message: No such user here
  deny: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
  end of ACL "TESTSUITE/aux-fixed/0386.acl1": DENY
@@ -94,15 +94,15 @@ check local_parts = 1
 1 in "1"? yes (matched "1")
 check acl = TESTSUITE/aux-fixed/0386.acl1
  using ACL "TESTSUITE/aux-fixed/0386.acl1"
- processing "accept" (TESTSUITE/test-config 43)
+ processing "accept" (TESTSUITE/test-config 44)
  check hosts = :
 host in ":"? no (end of list)
  accept: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
- processing "deny" (TESTSUITE/test-config 43)
+ processing "deny" (TESTSUITE/test-config 44)
  check local_parts = ^.*[@%!/|]
 1 in "^.*[@%!/|]"? no (end of list)
  deny: condition test failed in ACL "TESTSUITE/aux-fixed/0386.acl1"
- processing "require" (TESTSUITE/test-config 43)
+ processing "require" (TESTSUITE/test-config 44)
  l_message: Invalid sender
    message: Couldn't verify the sender
  check verify = sender/defer_ok
@@ -127,7 +127,7 @@ routed by r1 router
  ----------- end verify ------------
  sender x@y verified ok
  require: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
- processing "deny" (TESTSUITE/test-config 43)
+ processing "deny" (TESTSUITE/test-config 44)
    message: No such user here
  deny: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl1"
  end of ACL "TESTSUITE/aux-fixed/0386.acl1": DENY
@@ -188,7 +188,7 @@ check local_parts = 2
 2 in "2"? yes (matched "2")
 check acl = TESTSUITE/aux-fixed/0386.acl2
  read ACL from file TESTSUITE/aux-fixed/0386.acl2
- processing "warn" (TESTSUITE/test-config 43)
+ processing "warn" (TESTSUITE/test-config 44)
    message: X-Warning: $sender_host_address is listed at $dnslist_domain\nX-Warning: $dnslist_text
  l_message: found in $dnslist_domain: $dnslist_text
  check dnslists = rbl.test.ex 
@@ -205,7 +205,7 @@ DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) succeeded
 LOG: MAIN
   H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
 created log directory TESTSUITE/spool/log
- processing "accept" (TESTSUITE/test-config 43)
+ processing "accept" (TESTSUITE/test-config 44)
  accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
  end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT
 accept: condition test succeeded in ACL "chk_rcpt"
@@ -324,6 +324,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   message_suffix=\n
   maildir_use_size_file=no
   locking by lockfile fcntl 
+de-tainting path 'TESTSUITE/test-mail/2'
 lock name: TESTSUITE/test-mail/2.lock
 hitch name: TESTSUITE/test-mail/2.lock.test.ex.dddddddd.pppppppp
 lock file created
@@ -383,7 +384,7 @@ check local_parts = 2
 2 in "2"? yes (matched "2")
 check acl = TESTSUITE/aux-fixed/0386.acl2
  using ACL "TESTSUITE/aux-fixed/0386.acl2"
- processing "warn" (TESTSUITE/test-config 43)
+ processing "warn" (TESTSUITE/test-config 44)
    message: X-Warning: $sender_host_address is listed at $dnslist_domain\nX-Warning: $dnslist_text
  l_message: found in $dnslist_domain: $dnslist_text
  check dnslists = rbl.test.ex 
@@ -394,7 +395,7 @@ DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
  warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
 LOG: MAIN
   H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
- processing "accept" (TESTSUITE/test-config 43)
+ processing "accept" (TESTSUITE/test-config 44)
  accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
  end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT
 accept: condition test succeeded in ACL "chk_rcpt"
@@ -512,6 +513,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   message_suffix=\n
   maildir_use_size_file=no
   locking by lockfile fcntl 
+de-tainting path 'TESTSUITE/test-mail/2'
 lock name: TESTSUITE/test-mail/2.lock
 hitch name: TESTSUITE/test-mail/2.lock.test.ex.dddddddd.pppppppp
 lock file created
index 0177ee36d90cbb7bd29da1f076dd35966749de49..ac13db4cdca3a8fba867eada142e212e3313366c 100644 (file)
@@ -22,6 +22,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   message_suffix=\n
   maildir_use_size_file=no
   locking by lockfile fcntl 
+de-tainting path 'TESTSUITE/test-mail/userx'
 lock name: TESTSUITE/test-mail/userx.lock
 hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp
 lock file created
@@ -68,6 +69,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   message_suffix=\n
   maildir_use_size_file=no
   locking by lockfile fcntl 
+de-tainting path 'TESTSUITE/test-mail/userx'
 lock name: TESTSUITE/test-mail/userx.lock
 hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp
 lock file created
@@ -108,6 +110,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   message_suffix=\n
   maildir_use_size_file=no
   locking by lockfile fcntl 
+de-tainting path 'TESTSUITE/test-mail/userx'
 lock name: TESTSUITE/test-mail/userx.lock
 hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp
 lock file created
index 1240813dcc9a58d9b0d41065036ebcd39d2d43e2..cf57c90baa2a381d95b2451a327542973fda8d77 100644 (file)
@@ -17379,6 +17379,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   message_suffix=\n
   maildir_use_size_file=no
   locking by lockfile fcntl 
+de-tainting path 'TESTSUITE/test-mail/sender'
 lock name: TESTSUITE/test-mail/sender.lock
 hitch name: TESTSUITE/test-mail/sender.lock.test.ex.dddddddd.pppppppp
 lock file created
index bd7e753c327ab933d693b245ec38ae0951160ca9..1b55f031ef7a627c37860f633dc6857eb1b2eed1 100644 (file)
@@ -149,6 +149,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   message_suffix=\n
   maildir_use_size_file=no
   locking by lockfile fcntl 
+de-tainting path 'TESTSUITE/test-mail/userx'
 lock name: TESTSUITE/test-mail/userx.lock
 hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp
 lock file created
index 2a3446da4ef2b8e52be1a68a8dbb2365a66f0c55..277fba63b0ac4c7d898bd6487e7b584aadac815d 100644 (file)
@@ -32,7 +32,7 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<userx@test.ex>
-processing "accept" (TESTSUITE/test-config 33)
+processing "accept" (TESTSUITE/test-config 34)
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
@@ -150,6 +150,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   message_suffix=\n
   maildir_use_size_file=no
   locking by lockfile fcntl 
+de-tainting path 'TESTSUITE/test-mail/userx'
 lock name: TESTSUITE/test-mail/userx.lock
 hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp
 lock file created
index af4f4711864fd8f97ca24237b73a0543e9aff5c3..c91120311d45b9ae7610daebc224ce2fa0de81f6 100644 (file)
@@ -1 +1 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted
+1999-03-02 09:44:33 10HmaX-0005vi-00 == fred@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/fred' (file or directory name for local_delivery transport) not permitted
index cf343d6bab72304d9bf12117396b13b477cd7a14..c018546657f173fde9926a2aad9f7cc0a09c0f9c 100644 (file)
@@ -121,6 +121,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes
+de-tainting path 'TESTSUITE/test-mail/nofile'
 ensuring maildir directories exist in TESTSUITE/test-mail/nofile
 created directory TESTSUITE/test-mail/nofile
 created directory TESTSUITE/test-mail/nofile/tmp
@@ -305,6 +306,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes
+de-tainting path 'TESTSUITE/test-mail/userx'
 ensuring maildir directories exist in TESTSUITE/test-mail/userx
 created directory TESTSUITE/test-mail/userx/tmp
 created directory TESTSUITE/test-mail/userx/new
@@ -491,6 +493,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes
+de-tainting path 'TESTSUITE/test-mail/userx'
 ensuring maildir directories exist in TESTSUITE/test-mail/userx
 using regex for maildir directory selection: ^(?:cur|new|\..*)$
 looking for maildirsize in TESTSUITE/test-mail/userx
@@ -691,6 +694,7 @@ appendfile: mode=600 notify_comsat=0 quota=500 warning=0
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes
+de-tainting path 'TESTSUITE/test-mail/userx'
 ensuring maildir directories exist in TESTSUITE/test-mail/userx
 using regex for maildir directory selection: ^(?:cur|new|\..*)$
 looking for maildirsize in TESTSUITE/test-mail/userx
index 25b03e8debcabe38bc9c0733fcbdc5060941fbc3..250352ffb7669534235303a37bbfd1c06a0b34cd 100644 (file)
@@ -121,6 +121,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=50%
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=yes
+de-tainting path 'TESTSUITE/test-mail/userx'
 ensuring maildir directories exist in TESTSUITE/test-mail/userx
 created directory TESTSUITE/test-mail/userx
 created directory TESTSUITE/test-mail/userx/tmp
index f4577c3986672555fd62cba20d6c2ce1bed3f55f..8e2b7df409b025b02968e5fc9d7beee9c0cbfcf1 100644 (file)
@@ -17,6 +17,7 @@ appendfile: mode=600 notify_comsat=0 quota=1048576 warning=0
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=no
+de-tainting path 'TESTSUITE/test-mail/userx'
 ensuring maildir directories exist in TESTSUITE/test-mail/userx
 created directory TESTSUITE/test-mail/userx
 created directory TESTSUITE/test-mail/userx/tmp
@@ -56,6 +57,7 @@ appendfile: mode=600 notify_comsat=0 quota=1048576 warning=0
   message_prefix=null
   message_suffix=null
   maildir_use_size_file=no
+de-tainting path 'TESTSUITE/test-mail/userx'
 ensuring maildir directories exist in TESTSUITE/test-mail/userx
 quota checks on directory TESTSUITE/test-mail/userx
 MUNGED: the check_dir_size lines have been sorted to ensure consistency
index 9672fd86124bff4717d968d896b0e2bab7844bd2..64f9d9879026e517876bec2da3cf10ef4934afd0 100644 (file)
@@ -242,7 +242,7 @@ some.name in helo_lookup_domains? no (end of list)
 host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts? yes (matched "*")
 host in chunking_advertise_hosts? no (end of list)
-processing "accept" (TESTSUITE/test-config 78)
+processing "accept" (TESTSUITE/test-config 79)
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing "FAIL cannot route this one (FAIL)"@some.host
index 4e4673def28d5747bd1229c0bc52227739d7a4b9..2b1941f588598f1cdeb0ebf39d85a2c185ef6740 100644 (file)
@@ -4,3 +4,9 @@
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmaY-0005vi-00\r
+221 the.local.host.name closing connection\r