diff options
| -rw-r--r-- | usr.sbin/smtpd/makemap.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/queue_shared.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/runner.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtp.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 19 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 3 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.conf.5 | 5 | ||||
| -rw-r--r-- | usr.sbin/smtpd/util.c | 5 |
8 files changed, 22 insertions, 22 deletions
diff --git a/usr.sbin/smtpd/makemap.c b/usr.sbin/smtpd/makemap.c index 655cf08a3c5..e00c2bdf8b7 100644 --- a/usr.sbin/smtpd/makemap.c +++ b/usr.sbin/smtpd/makemap.c @@ -1,7 +1,8 @@ -/* $OpenBSD: makemap.c,v 1.16 2009/04/24 10:02:35 jacekm Exp $ */ +/* $OpenBSD: makemap.c,v 1.17 2009/05/10 11:29:40 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> + * Copyright (c) 2008-2009 Jacek Masiulaniec <jacekm@dobremiasto.net> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/usr.sbin/smtpd/queue_shared.c b/usr.sbin/smtpd/queue_shared.c index 330b95ad4fd..e8923e4966f 100644 --- a/usr.sbin/smtpd/queue_shared.c +++ b/usr.sbin/smtpd/queue_shared.c @@ -1,8 +1,9 @@ -/* $OpenBSD: queue_shared.c,v 1.17 2009/04/19 12:42:39 jacekm Exp $ */ +/* $OpenBSD: queue_shared.c,v 1.18 2009/05/10 11:29:40 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> + * Copyright (c) 2008-2009 Jacek Masiulaniec <jacekm@dobremiasto.net> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/usr.sbin/smtpd/runner.c b/usr.sbin/smtpd/runner.c index c20900b8008..a907ec4f4f6 100644 --- a/usr.sbin/smtpd/runner.c +++ b/usr.sbin/smtpd/runner.c @@ -1,8 +1,9 @@ -/* $OpenBSD: runner.c,v 1.43 2009/04/21 18:39:00 jacekm Exp $ */ +/* $OpenBSD: runner.c,v 1.44 2009/05/10 11:29:40 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> + * Copyright (c) 2008-2009 Jacek Masiulaniec <jacekm@dobremiasto.net> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c index ca77af8d047..85f668395af 100644 --- a/usr.sbin/smtpd/smtp.c +++ b/usr.sbin/smtpd/smtp.c @@ -1,8 +1,9 @@ -/* $OpenBSD: smtp.c,v 1.43 2009/05/09 18:59:09 jacekm Exp $ */ +/* $OpenBSD: smtp.c,v 1.44 2009/05/10 11:29:40 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> + * Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index 4f7fb35996a..bd69858a9ed 100644 --- a/usr.sbin/smtpd/smtp_session.c +++ b/usr.sbin/smtpd/smtp_session.c @@ -1,8 +1,9 @@ -/* $OpenBSD: smtp_session.c,v 1.83 2009/05/10 11:23:04 jacekm Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.84 2009/05/10 11:29:40 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> + * Copyright (c) 2008-2009 Jacek Masiulaniec <jacekm@dobremiasto.net> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -122,6 +123,8 @@ session_rfc3207_stls_handler(struct session *s, char *args) session_respond(s, "220 Ready to start TLS"); s->s_state = S_TLS; + bufferevent_disable(s->s_bev, EV_READ); + ssl_session_init(s); return 1; } @@ -595,10 +598,7 @@ session_pickup(struct session *s, struct submit_status *ss) break; case S_TLS: - s->s_flags |= F_EVLOCKED; - bufferevent_disable(s->s_bev, EV_READ|EV_WRITE); s->s_state = S_GREETED; - ssl_session_init(s); break; case S_MAIL_MFA: @@ -819,15 +819,8 @@ session_write(struct bufferevent *bev, void *p) { struct session *s = p; - if (!(s->s_flags & F_QUIT)) { - - if (s->s_state == S_TLS) - session_pickup(s, NULL); - - return; - } - - session_destroy(s); + if (s->s_flags & F_QUIT) + session_destroy(s); } void diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index f5097e4fa28..b6d90c6a414 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,8 +1,9 @@ -/* $OpenBSD: smtpd.c,v 1.56 2009/04/21 18:39:00 jacekm Exp $ */ +/* $OpenBSD: smtpd.c,v 1.57 2009/05/10 11:29:40 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> + * Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5 index e99ec9bf241..726a132eac9 100644 --- a/usr.sbin/smtpd/smtpd.conf.5 +++ b/usr.sbin/smtpd/smtpd.conf.5 @@ -1,6 +1,7 @@ -.\" $OpenBSD: smtpd.conf.5,v 1.9 2009/04/10 05:35:31 jmc Exp $ +.\" $OpenBSD: smtpd.conf.5,v 1.10 2009/05/10 11:29:40 jacekm Exp $ .\" .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org> +.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net> .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -15,7 +16,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.Dd $Mdocdate: April 10 2009 $ +.Dd $Mdocdate: May 10 2009 $ .Dt SMTPD.CONF 5 .Os .Sh NAME diff --git a/usr.sbin/smtpd/util.c b/usr.sbin/smtpd/util.c index f2458e16841..d675df5f738 100644 --- a/usr.sbin/smtpd/util.c +++ b/usr.sbin/smtpd/util.c @@ -1,8 +1,9 @@ -/* $OpenBSD: util.c,v 1.20 2009/04/24 10:02:35 jacekm Exp $ */ +/* $OpenBSD: util.c,v 1.21 2009/05/10 11:29:40 jacekm Exp $ */ /* - * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> * Copyright (c) 2000,2001 Markus Friedl. All rights reserved. + * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> + * Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above |