commit 6f7024a6c31f36d306a02de9804cb9d93cd67a7c
parent a51f05100e116e359def8ed61966e6a5d3964813
Author: Ellenor Bjornsdottir <ellenor@umbrellix.net>
Date: Sun, 9 Oct 2022 06:54:51 +0000
Merge branch 'trunk' of invictus.wa.us.umbrellix.net:nightmaremail into trunk
Diffstat:
4 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -380,3 +380,4 @@ qmail-send.service
*.rej
.dep.*
*.obj
+src/mxf-remote/mxf-remote
diff --git a/qmail-qstat.sh b/qmail-qstat.sh
@@ -0,0 +1,7 @@
+cd QMAIL
+messdirs=`echo queue/mess/* | wc -w`
+messfiles=`find queue/mess/* -print | wc -w`
+tododirs=`echo queue/todo | wc -w`
+todofiles=`find queue/todo -print | wc -w`
+echo messages in queue: `expr $messfiles - $messdirs`
+echo messages in queue but not yet preprocessed: `expr $todofiles - $tododirs`
diff --git a/qmail-upq.sh b/qmail-upq.sh
@@ -0,0 +1,14 @@
+cd QMAIL
+cd queue
+for dir in mess info local remote
+do
+ ( cd $dir; find . -type f -print ) | (
+ cd $dir
+ while read path
+ do
+ id=`basename "$path"`
+ sub=`expr "$id" % SPLIT`
+ mv "$path" "$sub"/"$id"
+ done
+ )
+done
diff --git a/src/mxf-remote/mxf-remote.c b/src/mxf-remote/mxf-remote.c
@@ -1136,8 +1136,10 @@ int main (int argcount, char **args)
if (!stralloc_copys(&Host,relayhost)) temp_nomem();
}
- if (!port) port = routesproto->defport;
- if (skipmx) break;
+ if (skipmx) {
+ if (!port) port = routesproto->defport;
+ break;
+ }
}
// fire off the SRV/MX DNS volley; wait Timeoutconnect seconds from when
