summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/process.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/process.cc b/src/process.cc
index 6d3b2a2..4807b98 100644
--- a/src/process.cc
+++ b/src/process.cc
@@ -167,12 +167,18 @@ void process::notify_mailto(const string& email,const string& id,const string& e
close(files[0]);
close(files[1]);
execl("/usr/sbin/sendmail","usr/sbin/sendmail","-i",email.c_str(),NULL);
_exit(-1);
}
// parent
+ int status;
+ if(waitpid(pid,&status,WNOHANG)) {
+ close(files[0]);
+ close(files[1]);
+ throw runtime_error("vfork()ed sendmail child exited unexpectedly");
+ }
close(files[0]);
FILE *mta = fdopen(files[1],"w");
for(headers_t::const_iterator i=mailto_headers.begin();i!=mailto_headers.end();++i) {
fprintf(mta,"%s: %s\n",i->first.c_str(),i->second.c_str());
}
for(headers_t::const_iterator i=config.mailto_headers.begin();i!=config.mailto_headers.end();++i) {
@@ -185,13 +191,12 @@ void process::notify_mailto(const string& email,const string& id,const string& e
"%s\n"
"---\n"
"This message was sent automatically by the 'dudki' daemon\n",
id.c_str(), event.c_str(),
description.c_str() );
fclose(mta);
- int status;
waitpid(pid,&status,0);
// TODO: check the return code
}
void process::signal(int signum) const {
if(!pidfile.empty()) {