retronetworking
/
capisuite
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1 from cloph/pr_sendmail 

default to sendmail command again to allow for lightweight MTAs
This commit is contained in:
Lars Immisch 2013-05-26 05:53:53 -07:00
parent 4775a92ad3 bd7cf7e855
commit 9bc21f9d2e
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/helpers.pyin
View File

@ -48,18 +48,14 @@ def uniqueName(*args, **kwargs):
return capisuite.fileutils.uniqueName(*args, **kwargs)[1] return capisuite.fileutils.uniqueName(*args, **kwargs)[1]
def __sendmail(mail_from, mail_to, msg): def __sendmail(mail_from, mail_to, msg):
import popen2, capisuite.core import capisuite.core
from subprocess import Popen,PIPE,STDOUT
r,w = popen2.popen2("{ /usr/sbin/sendmail -t -f %s } 2>&1" % escape(mail_from)) sendmail_p = Popen(['/usr/sbin/sendmail', '-t'], stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)
try: try:
w.write(msg.as_string()) text = sendmail_p.communicate(msg.as_string())[0]
except IOError: #Errno 32: Broken Pipe except IOError: #Errno 32: Broken Pipe
capisuite.core.error("Error while calling sendmail. Not installed?\n") capisuite.core.error("Error while calling sendmail. Not installed?\n")
return 0 return 0
w.close()
#ret = sendmail.wait()
text = r.read()
r.close()
if text: if text:
capisuite.core.error("Error while calling sendmail")#, return code=%i" % ret) capisuite.core.error("Error while calling sendmail")#, return code=%i" % ret)
capisuite.core.error(text) capisuite.core.error(text)
@ -67,14 +63,14 @@ def __sendmail(mail_from, mail_to, msg):
capisuite.core.log("sendmail finished successful",3) capisuite.core.log("sendmail finished successful",3)
return 1 return 1
def __sendmail(fromaddr, toaddr, msg): #def __sendmail(fromaddr, toaddr, msg):
import smtplib, capisuite.core # import smtplib, capisuite.core
smtpserver, port = 'localhost', 25 # smtpserver, port = 'localhost', 25
server = smtplib.SMTP(smtpserver, port) # server = smtplib.SMTP(smtpserver, port)
server.sendmail(fromaddr, (toaddr), msg.as_string()) # server.sendmail(fromaddr, (toaddr), msg.as_string())
server.quit() # server.quit()
capisuite.core.log("mail sent successfully",3) # capisuite.core.log("mail sent successfully",3)
return 1 # return 1
def __call(msg, cmd, *args): def __call(msg, cmd, *args):