From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 28 Mar 2006 12:19:00 +0000 (+0100)
Subject: inject: Only insert an Approved header if one was requested.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/newsgate/commitdiff_plain/9eacde01a08fa455949c1bc0d59540579685eb57

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

diff --git a/bin/inject b/bin/inject
index 6dbfdb3..3d7c65d 100755
--- 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 43e5f32..3ca4520 100755
--- 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