mail: Send mail with the correct envelope sender.

[newsgate] / bin / mail

diff --git a/bin/mail b/bin/mail
index 20b2d66..afcc0d8 100755 (executable)
--- a/bin/mail
+++ b/bin/mail
@@ -5,11 +5,11 @@ set -e
 
 [ $# = 1 ] || fail "usage: $0 GROUP"
 group=$1
-entry=`cdbget "g:$group" <groups.cdb` || bad "unknown group $group"
+entry=`cdb -q groups.cdb "g:$group"` || bad "unknown group $group"
 set -- $entry
 [ $3 = none ] && bad "posting to mail.$2 forbidden"
 { echo "To: $3";
   sed -n ":top; /^$/,\$ b ok
           /^[Tt][Oo]: / ! b ok; :loop; n; /^ / b loop; b top
           :ok; p"; } |
-qmail-inject -a -f$USER-$1@`cat $QMAIL/control/me` $3
+qmail-inject -a -f$USER-$1@$(control defaulthost "$me") $3