Changeset 2758a4b for npl/mailserver

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'

Location:

npl/mailserver/netqmail

Files:

• netqmail.SlackBuild.log.gz (modified) (previous)
• netqmail.build (modified) (1 diff)
• netqmail.md5 (modified) (2 diffs)
• netqmail.pkg (modified) (previous)
• syn3-dagent (modified) (2 diffs)

npl/mailserver/netqmail/netqmail.build

@@ -1 @@
-6345
+6347

npl/mailserver/netqmail/netqmail.md5

@@ -1 +1 @@
 604085a48a5bbb909a67a9a0cedbb173  ./helodnscheck2.c
 4c03848af9d37e281f3b82cc59230d9b  ./netqmail-1.05.tar.gz
-4fdd0da2cd330fe40167da1bedbcf888  ./netqmail.pkg
+c0f9e13fda7f2824929d9acf5da295a2  ./netqmail.pkg
 2fbb3489040f1d869f6a653c00f9f72d  ./netqmail.SlackBuild
-4a6f732e1fa749228065fea1e3fde06b  ./netqmail.SlackBuild.log.gz
+07e0b95565051cf920261f1d4d45417b  ./netqmail.SlackBuild.log.gz
 9140ad2b03017145cd7963c84bb24f16  ./qmail-103.patch
 49c6b7898cc85df03dfabb190c7ffc4a  ./qmailctl
@@ -11 +11 @@
 13356ef41ba7a8508fa570d569b117cf  ./qmail-spp-spf-20091020.c
 bcafe3f1412a9eef6efe09a97234c04c  ./qmail-tap.diff
-c792b7df655910b6c918d59acc672e0c  ./syn3-dagent
+a23a39d1e0321a8d4fc6eeea60df829b  ./syn3-dagent

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