diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2011-04-14 21:53:47 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2011-04-14 21:53:47 +0000 |
| commit | 1dfda728514d3dfa5392aaba1e10de003909639e (patch) | |
| tree | 1548848951e6ac789341b133c5c573d9617b792b /usr.sbin/smtpd/runner.c | |
| parent | 31f310c8229e9d38537aeee483beecd845fcd8c6 (diff) | |
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/runner.c')
| -rw-r--r-- | usr.sbin/smtpd/runner.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/smtpd/runner.c b/usr.sbin/smtpd/runner.c index fb8e185f0ab..22b13ee81cc 100644 --- a/usr.sbin/smtpd/runner.c +++ b/usr.sbin/smtpd/runner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: runner.c,v 1.97 2011/04/14 20:11:08 gilles Exp $ */ +/* $OpenBSD: runner.c,v 1.98 2011/04/14 21:53:46 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -56,7 +56,7 @@ void runner_process_batch(struct smtpd *, struct ramqueue_envelope *, time_t); void runner_purge_run(void); void runner_purge_message(char *); -int runner_check_loop(struct message *); +int runner_check_loop(struct smtpd *, struct message *); int runner_force_message_to_ramqueue(struct ramqueue *, char *); @@ -363,7 +363,7 @@ runner_process_envelope(struct smtpd *env, struct ramqueue_envelope *rq_evp, tim return 0; } - if (runner_check_loop(&envelope)) { + if (runner_check_loop(env, &envelope)) { struct message bounce; message_set_errormsg(&envelope, "loop has been detected"); @@ -421,7 +421,7 @@ runner_process_batch(struct smtpd *env, struct ramqueue_envelope *rq_evp, time_t &envelope)) return; envelope.lasttry = curtm; - fd = queue_open_message_file(envelope.message_id); + fd = queue_message_fd_r(env, Q_QUEUE, rq_evp->batch->m_id); imsg_compose_event(env->sc_ievs[PROC_QUEUE], IMSG_MDA_SESS_NEW, PROC_MDA, 0, fd, &envelope, sizeof envelope); @@ -585,7 +585,7 @@ delroot: } int -runner_check_loop(struct message *messagep) +runner_check_loop(struct smtpd *env, struct message *messagep) { int fd; FILE *fp; @@ -595,7 +595,7 @@ runner_check_loop(struct message *messagep) int ret = 0; int rcvcount = 0; - fd = queue_open_message_file(messagep->message_id); + fd = queue_message_fd_r(env, Q_QUEUE, messagep->message_id); if ((fp = fdopen(fd, "r")) == NULL) fatal("fdopen"); |