Changeset 2758a4b for npl/mailserver/netqmail/syn3-dagent

Timestamp:

09/26/17 13:30:36 (8 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master, perl-5.22

Children:

07ead96

Parents:

9ec1a22 (diff), c6da4cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'gcc484'

File:

• npl/mailserver/netqmail/syn3-dagent (modified) (2 diffs)

npl/mailserver/netqmail/syn3-dagent

@@ -15 +15 @@
 }
 
-#check if user exists or fail permanent
-#(id will generate a nice error message)
-id "$USER" >/dev/null || end 100
+# some kind of ldap problem, try again later
+id "Administrator" >/dev/null || end 111
+
+#does the user exists?
+if ! id "$USER" >/dev/null; then
+        #we're sure theres no ldap problem?
+        id "Administrator" >/dev/null || end 111
+        #probably a bounce spammer, drop mail silently
+        echo "User does not exist, dropping mail."
+        end 0
+fi
 
 #store mail temporary
@@ -61 +69 @@
 #no backend mailstorage up, so fail temporary
 echo "All mailbackends are down, retry again later..."
-end 1
+end 111