inject: Only insert an Approved header if one was requested.

diff --git a/bin/inject b/bin/inject
index 6dbfdb3ac62ebc68269ff4b0c285b33c90b8323c..3d7c65d2bd12095fae2dadb52a7135a61eb7682c 100755 (executable)
--- a/bin/inject
+++ b/bin/inject
@@ -104,8 +104,8 @@ def send():
   hdr.write('Path: newsgate\r\n'
             'Distribution: mail\r\n'
             'Newsgroups: %s\r\n'
-            'Approved: %s\r\n'
-            % (group, approved or 'newsgate@%s' % host))
+            % group)
+  if approved: hdr.write('Approved: %s\r\n' % approved)
   xify = {}
   for h in '''
     lines xref newsgroups path distribution approved received

diff --git a/bin/post b/bin/post
index 43e5f32f6b61853d46213676e822ef63474eb0cc..3ca4520de710c3d3021a054e4c39c02059d1038c 100755 (executable)
--- a/bin/post
+++ b/bin/post
@@ -8,4 +8,4 @@ tag=$1
 entry=`cdb -q groups.cdb "t:$tag"` || bad "unknown tag $tag"
 set -- $entry
 case "$SENDER" in $4) ;; *) bad "incorrect sender $SENDER" ;; esac
-exec bin/inject mail.$2
+exec bin/inject -a newsgate@distorted.org.uk mail.$2