Browse Source

separate the TO alias and TO addr and remove debug

Pi 1 year ago
parent
commit
a5ad2286f4
1 changed files with 4 additions and 9 deletions
  1. 4 9
      maildroprc

+ 4 - 9
maildroprc

@@ -64,13 +64,13 @@ foreach /^(To|Cc):.*/
       TOMEMBER=1
       CONTINUE=1
    }
-   foreach /^(To|Cc):\s+(.*)\s+.*\<$ORGANIZERGROUPREGEX\>$/
+   foreach /^(To|Cc):\s+(.*)\s+\<$ORGANIZERGROUPREGEX\>$/
    {
-      TO=$MATCH2
+      TOALIAS=$MATCH2
    }
-   foreach /^(To|Cc):\s+(.*)\s+\<$MEMBERGROUPREGEX$\>/
+   foreach /^(To|Cc):\s+(.*)\s+\<$MEMBERGROUPREGEX\>$/
    {
-      TO=$MATCH2
+      TOALIAS=$MATCH2
    }
 }
 
@@ -107,9 +107,6 @@ LISTDIR="/var/mail/maildrop/$MAILGROUP"
 MLIST="$LISTDIR/mlist"
 SLIST="$LISTDIR/slist"
 
-#cc "|$DEBUGMAIL inspect"
-#EXITCODE=$FATAL
-#exit
 
 if ($TOPOSTMASTER)
 {
@@ -144,7 +141,6 @@ if ($TOPOSTMASTER)
       # No response to unregistered users
       exit
    }
-   #cc "|$DEBUGMAIL"
    EXITCODE=$UNHANDLED
    # No response to unregistered users
    exit
@@ -164,7 +160,6 @@ if ($ALIAS eq "")
        SLIST="$LISTDIR/alist"
        to "!"
     }
-    cc "|$DEBUGMAIL"
     EXITCODE=$UNREGISTERED
     exit
 }