aboutsummaryrefslogtreecommitdiffstats
path: root/smtpd/delivery_maildir.c
diff options
context:
space:
mode:
authorCharles Longeau <github@chl.be>2012-11-15 22:06:50 +0100
committerCharles Longeau <github@chl.be>2012-11-15 22:06:50 +0100
commit3ef4f4ce6d634d598a8bb54d1d3ae6b68ad5a89a (patch)
treef5903ac539b1f2ca9dbf638cb5d9914c0b1a4410 /smtpd/delivery_maildir.c
parentMerge branch 'master' into portable (diff)
parentMerge branch 'cleanup' (diff)
downloadOpenSMTPD-3ef4f4ce6d634d598a8bb54d1d3ae6b68ad5a89a.tar.xz
OpenSMTPD-3ef4f4ce6d634d598a8bb54d1d3ae6b68ad5a89a.zip
fix merge master conflicts
Diffstat (limited to 'smtpd/delivery_maildir.c')
-rw-r--r--smtpd/delivery_maildir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/smtpd/delivery_maildir.c b/smtpd/delivery_maildir.c
index 66ebefde..6f795908 100644
--- a/smtpd/delivery_maildir.c
+++ b/smtpd/delivery_maildir.c
@@ -60,7 +60,7 @@ delivery_maildir_open(struct deliver *deliver)
char *msg;
int n;
-#define error(m) { msg = m; goto err; }
+#define error(m) { msg = m; goto err; }
#define error2(m) { msg = m; goto err2; }
setproctitle("maildir delivery");