diff options
| author |   gilles <gilles@openbsd.org> | 2011-04-14 21:53:45 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2011-04-14 21:53:45 +0000 |
| commit | 272b4ea13fc3ddef5c1323e5496582cd09a77269 (patch) | |
| tree | bd177fd02eee8e0b6e12038086e7ff4c0a8e702d /usr.sbin/smtpd/queue.c | |
| parent | the mechanical part of 82580 support, more to come (diff) | |
| download | wireguard-openbsd-272b4ea13fc3ddef5c1323e5496582cd09a77269.tar.xz wireguard-openbsd-272b4ea13fc3ddef5c1323e5496582cd09a77269.zip | |
fsqueue now provides fsqueue_message_fd_r() and fsqueue_message_fd_rw() to
obtain a read{-only,/write} descriptor to the message file.
make sure smtpd uses the new API everywhere it needs a fd, and kill the
many functions that were used until now.
Diffstat (limited to 'usr.sbin/smtpd/queue.c')
| -rw-r--r-- | usr.sbin/smtpd/queue.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c index c9515bc6bc6..8669ae231ae 100644 --- a/usr.sbin/smtpd/queue.c +++ b/usr.sbin/smtpd/queue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue.c,v 1.95 2011/04/13 20:53:18 gilles Exp $ */ +/* $OpenBSD: queue.c,v 1.96 2011/04/14 21:53:45 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -106,9 +106,9 @@ queue_imsg(struct smtpd *env, struct imsgev *iev, struct imsg *imsg) case IMSG_QUEUE_MESSAGE_FILE: ss.id = m->session_id; if (m->flags & F_MESSAGE_ENQUEUED) - fd = enqueue_open_messagefile(m); + fd = queue_message_fd_rw(env, Q_ENQUEUE, m->message_id); else - fd = queue_open_incoming_message_file(m); + fd = queue_message_fd_rw(env, Q_INCOMING, m->message_id); if (fd == -1) ss.code = 421; imsg_compose_event(iev, IMSG_QUEUE_MESSAGE_FILE, 0, 0, fd, @@ -170,7 +170,7 @@ queue_imsg(struct smtpd *env, struct imsgev *iev, struct imsg *imsg) switch (imsg->hdr.type) { case IMSG_QUEUE_MESSAGE_FD: rq_batch = imsg->data; - fd = queue_open_message_file(rq_batch->m_id); + fd = queue_message_fd_r(env, Q_QUEUE, rq_batch->m_id); imsg_compose_event(iev, IMSG_QUEUE_MESSAGE_FD, 0, 0, fd, rq_batch, sizeof *rq_batch); return; |