mail/maildrop/patches/patch-ac

   1 $NetBSD: patch-ac,v 1.4 2010/06/15 23:14:47 pettai Exp $
   2
   3 --- maildrop/main.C.orig        2006-10-01 20:03:37.000000000 -0400
   4 +++ maildrop/main.C
   5 @@ -575,7 +575,7 @@ uid_t       my_u=getuid();
   6         if (!found)
   7         {
   8  #if HAVE_COURIER
   9 -               if (!deliverymode)
  10 +               if (!deliverymode || !getenv("COURIER_MTA"))
  11  #endif
  12                 {
  13                         my_pw=getpwuid(my_u);
  14 @@ -635,6 +635,14 @@ Buffer     value;
  15         {
  16         const char *p;
  17
  18 +               /*
  19 +                * To allow one maildrop to be used by both courier MTA
  20 +                * and others, we require courier MTA to set COURIER_MTA
  21 +                * in the environment before running maildrop.
  22 +                */
  23 +               if (getenv("COURIER_MTA"))
  24 +               {       /* COURIER_MTA */
  25 +
  26                 if ((p=getenv("HOME")) && *p)
  27                         maildrop.init_home=p;
  28
  29 @@ -659,6 +667,8 @@ Buffer      value;
  30
  31                 if ((p=getenv("MAILDIRQUOTA")) && *p)
  32                         maildrop.init_quota=p;
  33 +
  34 +               }       /* COURIER_MTA */
  35         }
  36  #endif
  37