Bladeren bron

WIP - gdbm value can not be empty ... refactoring to remove gdbm for vars

Pi 1 jaar geleden
bovenliggende
commit
7059c8253c
2 gewijzigde bestanden met toevoegingen van 19 en 5 verwijderingen
  1. 1 1
      filters/cropswap@shandan.one
  2. 18 4
      maildroprc

+ 1 - 1
filters/cropswap@shandan.one

@@ -30,7 +30,7 @@ if (!$CONTINUE)
          EXITCODE=$FATAL
          exit
       }
-         foreach /^(To|Cc):\s+(.*)\s+\<$ORGANIZERGROUPREGEX\>$/
+      foreach /^(To|Cc):\s+(.*)\s+\<$ORGANIZERGROUPREGEX\>$/
       {
          gdbmstore("TOALIAS", "$MATCH2")
       }

+ 18 - 4
maildroprc

@@ -11,7 +11,7 @@ MAILBOT="/usr/bin/mailbot"
 SIGNUPRESP="/opt/cropswap/signup.eml"
 SUBSCRIBERESP="/opt/cropswap/subunsub.eml"
 FILTERDIR="/opt/cropswap/filters"
-DEBUG=0
+DEBUG=1
 if ($DEBUG)
 {
    MAILBOT="/opt/cropswap/debug.sh"
@@ -45,7 +45,7 @@ FATAL=1
 
 STAGE="/var/mail/maildrop/stage"
 flock $STAGE {
-   if (gdbmopen($STAGE, "C"))
+   if (gdbmopen($STAGE, "W") != 0)
    {
       cc "|$DEBUGMAIL init-stages-fail"
       EXITCODE=$FATAL
@@ -55,8 +55,19 @@ flock $STAGE {
    gdbmstore("TOMEMBER", "NO")
    gdbmstore("TOORGANIZER", "NO")
    gdbmstore("TOPOSTMASTER", "NO")
-   gdbmstore("MAILGROUP", "")
+   gdbmstore("MAILGROUP", "NONE")
+      cc "|$DEBUGMAIL 'init variables pre fetch'"
+   if (gdbmstore("TOALIAS", "NONE") !=0)
+{
+
+      cc "|$DEBUGMAIL 'init variables fail write'"
+EXITCODE=$FATAL
+exit
+}
+   gdbmstore("SUBJECT", "")
    CONTINUE=(gdbmfetch("CONTINUE") eq "YES")
+   TOALIAS=gdbmfetch("TOALIAS")
+      cc "|$DEBUGMAIL 'init variables'"
    gdbmclose
 }
 
@@ -65,7 +76,7 @@ foreach /^(To|Cc):.*/
    ADDR=getaddr($MATCH)
    foreach (tolower $ADDR) =~ /^$HANDLEDREGEX$/
    {
-      cc "|$DEBUGMAIL include match $MATCH"
+      cc "|$DEBUGMAIL 'include match $MATCH'"
       include "$FILTERDIR/$MATCH"
    }
 }
@@ -82,7 +93,9 @@ TOMEMBER=(gdbmfetch("TOMEMBER") eq "YES")
 TOORGANIZER=(gdbmfetch("TOORGANIZER") eq "YES")
 MAILGROUP=gdbmfetch("MAILGROUP")
 SUBJECT=gdbmfetch("SUBJECT")
+      cc "|$DEBUGMAIL 'post variables pre fetch'"
 TOALIAS=gdbmfetch("TOALIAS")
+      cc "|$DEBUGMAIL 'post variables post fetch'"
 gdbmclose
 
 if (!$CONTINUE)
@@ -162,6 +175,7 @@ if (!$FORWARD)
 # SUBSCRIBED USERS
 #
 NOFORWARD=$FROM
+cc "|$DEBUGMAIL forwarding"
 include "$FILTERDIR/$MAILGROUP"
 
 cc "|$DEBUGMAIL unhandled"