summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/smtpd.h
diff options
context:
space:
mode:
authorEric Faurot <eric@cvs.openbsd.org>2011-11-16 11:18:56 +0000
committerEric Faurot <eric@cvs.openbsd.org>2011-11-16 11:18:56 +0000
commitfeee35baa6a575f5baa2fa17578ab03e53b4f877 (patch)
tree00e5624bed2e6777332eb52dd135b3f53833f83d /usr.sbin/smtpd/smtpd.h
parentd4454191d3605ab52a417b547678581296b4e257 (diff)
Do not unlink an offline message until it has been correctly enqueued.
While there, simplify the offline_enqueue() function by doing all the sanity checks in the forked process, and remove all fatal(): on error, the offline message is left untouched in the directory. Also, get rid of the path_starts_with() check since all paths to offline messages are now constructed internally. ok gilles@ chl@
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
-rw-r--r--usr.sbin/smtpd/smtpd.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index 701822053e9..05090f39e34 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.251 2011/11/15 23:06:39 gilles Exp $ */
+/* $OpenBSD: smtpd.h,v 1.252 2011/11/16 11:18:55 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -450,6 +450,7 @@ struct child {
enum smtp_proc_type title;
int mda_out;
u_int32_t mda_id;
+ char *path;
};
enum session_state {