summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/smtpd/smtpd.c5
-rw-r--r--usr.sbin/smtpd/smtpd.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index 4aed7f9664e..95e589c0d85 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.c,v 1.119 2011/04/14 20:11:08 gilles Exp $ */
+/* $OpenBSD: smtpd.c,v 1.120 2011/04/14 22:46:38 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -57,7 +57,6 @@ void forkmda(struct smtpd *, struct imsgev *, u_int32_t,
struct deliver *);
int parent_enqueue_offline(struct smtpd *, char *);
int parent_forward_open(char *);
-int setup_spool(uid_t, gid_t);
int path_starts_with(char *, char *);
void fork_peers(struct smtpd *);
@@ -492,7 +491,7 @@ main(int argc, char *argv[])
if (env.sc_queue == NULL)
errx(1, "could not find queue backend");
- if (!env.sc_queue->setup(&env))
+ if (!env.sc_queue->init(&env))
errx(1, "invalid directory permissions");
log_init(debug);
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index fd46dd6c4ad..452ffd92134 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.211 2011/04/14 22:36:09 gilles Exp $ */
+/* $OpenBSD: smtpd.h,v 1.212 2011/04/14 22:46:38 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -931,7 +931,7 @@ enum queue_op {
struct queue_backend {
enum queue_type type;
- int (*setup)(struct smtpd *);
+ int (*init)(struct smtpd *);
int (*message)(struct smtpd *, enum queue_kind, enum queue_op, char *);
int (*envelope)(struct smtpd *, enum queue_kind, enum queue_op,
struct message *);