X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=1f63e683fa6490beb738a2a28be88eb8a35f4828;hb=refs%2Fheads%2Fsalsa;hp=073ee4f823af598019db99088252889e9e69d02b;hpb=c61076ac9d401f7abf65d5e1eac7f5a666a32ba4;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-mailgate b/ud-mailgate
index 073ee4f..1f63e68 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -859,10 +859,10 @@ try:
 
     # Send the message through sendmail
     ErrMsg = "A problem occured while trying to send the reply"
-    Child = os.popen("/usr/sbin/sendmail -t", "w")
-    #   Child = os.popen("cat","w")
-    Child.write(Reply)
-    if Child.close() is not None:
+    Child = subprocess.Popen(['/usr/sbin/sendmail', '-t'], stdin=subprocess.PIPE)
+    Child.stdin.write(Reply)
+    Child.stdin.close()
+    if Child.wait() != 0:
         raise UDExecuteError("Sendmail gave a non-zero return code")
 
 except Exception:
@@ -888,10 +888,11 @@ except Exception:
     try:
         ErrReply = TemplateSubst(Subst, open(TemplatesDir + "error-reply", "r").read())
 
-        Child = os.popen("/usr/sbin/sendmail -t -oi -f ''", "w")
-        Child.write(ErrReplyHead)
-        Child.write(ErrReply)
-        if Child.close() is not None:
+        Child = subprocess.Popen(['/usr/sbin/sendmail', '-t', '-oi', '-f', ''], stdin=subprocess.PIPE)
+        Child.stdin.write(ErrReplyHead)
+        Child.stdin.write(ErrReply)
+        Child.stdin.close()
+        if Child.wait() != 0:
             raise UDExecuteError("Sendmail gave a non-zero return code")
     except Exception:
         sys.exit(EX_TEMPFAIL)