From d5e42ef83ca124567238c86396ed471a903b1fe0 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 30 Nov 2004 15:46:13 +0000 Subject: [PATCH] committed a fix for sendmail git-svn-id: http://svn.opengroupware.org/SOPE/trunk@425 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-mime/ChangeLog | 4 ++++ sope-mime/NGMail/ChangeLog | 4 ++++ sope-mime/NGMail/NGSendMail.m | 8 ++++---- sope-mime/Version | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog index 375acd26..57ba72f1 100644 --- a/sope-mime/ChangeLog +++ b/sope-mime/ChangeLog @@ -1,3 +1,7 @@ +2004-11-30 Helge Hess + + * NGMail: fixed a bug in NGSendMail (v4.5.202) + 2004-11-28 Helge Hess * NGImap4: improvements in the Sieve client (v4.5.201) diff --git a/sope-mime/NGMail/ChangeLog b/sope-mime/NGMail/ChangeLog index 710a3002..f788fbd7 100644 --- a/sope-mime/NGMail/ChangeLog +++ b/sope-mime/NGMail/ChangeLog @@ -1,3 +1,7 @@ +2004-11-30 Helge Hess + + * NGSendMail.m: properly pass the command line to sendmail + 2004-10-29 Helge Hess * NGSendMail.m: use fwrite() to write to pipe diff --git a/sope-mime/NGMail/NGSendMail.m b/sope-mime/NGMail/NGSendMail.m index aba5465f..4a20bde4 100644 --- a/sope-mime/NGMail/NGSendMail.m +++ b/sope-mime/NGMail/NGSendMail.m @@ -222,8 +222,8 @@ /* sending the mail */ -- (FILE *)openStreamToSendMail { - return popen([[self executablePath] cString], "w"); +- (FILE *)openStreamToSendMail:(NSString *)_cmdline { + return [_cmdline isNotNull] ? popen([_cmdline cString], "w") : NULL; } - (int)closeStreamToSendMail:(FILE *)_mail { if (_mail == NULL) @@ -395,7 +395,7 @@ sendmail = [self buildSendMailCommandLineWithSender:_sender]; [self addRecipients:_to toCmdLine:sendmail]; - if ((toMail = [self openStreamToSendMail]) == NULL) + if ((toMail = [self openStreamToSendMail:sendmail]) == NULL) return [self failedToStartSendMailError:errno]; if ([self isSendLoggingEnabled]) [self _logMailSend:sendmail ofPath:_path]; @@ -427,7 +427,7 @@ sendmail = [self buildSendMailCommandLineWithSender:_sender]; [self addRecipients:_to toCmdLine:sendmail]; - if ((toMail = [self openStreamToSendMail]) == NULL) + if ((toMail = [self openStreamToSendMail:sendmail]) == NULL) return [self failedToStartSendMailError:errno]; if ([self isSendLoggingEnabled]) [self _logMailSend:sendmail ofData:_data]; diff --git a/sope-mime/Version b/sope-mime/Version index 51cb919c..7b780dd4 100644 --- a/sope-mime/Version +++ b/sope-mime/Version @@ -2,6 +2,6 @@ MAJOR_VERSION:=4 MINOR_VERSION:=5 -SUBMINOR_VERSION:=201 +SUBMINOR_VERSION:=202 # v4.2.149 requires libNGStreams v4.2.34 -- 2.39.5