Removed the requirement that there be whitespace between CONFIRM and

[attachcheck] / attachcheck

diff --git a/attachcheck b/attachcheck
old mode 100644 (file)
new mode 100755 (executable)
index ebcd6be..6a625e9
--- a/attachcheck
+++ b/attachcheck
@@ -16,7 +16,7 @@ __author__ = "Benjamin Mako Hill <mako@debian.org>"
 ###########################################
 
 # location of the sendmail binary
-sendmail = "/usr/sbin/sendmail -oi"
+sendmail = "/usr/sbin/sendmail"
 
 # list of mimetype which are, for the sake of this program, not
 # attachments
@@ -42,7 +42,7 @@ def send_message():
     global sendmail
     sendmail = sendmail + " " + " ".join( sys.argv[1:] )
    
-    mailpipe = os.popen("%s -t" % sendmail_with_args, 'w')
+    mailpipe = os.popen("%s" % sendmail, 'w')
     mailpipe.write( message_string )
     sys.exit( mailpipe.close() )
 
@@ -115,7 +115,7 @@ if attachment_expected:
         # check for the confirmation
 
         if re.search( r'Subject: CONFIRM', message_string ):
-            message_string = re.sub( r'(Subject: )(CONFIRM )(.*?)\n',
+            message_string = re.sub( r'(Subject: )(CONFIRM)(.*?)\n',
                                      r'\1\3\n', message_string )
             send_message()