diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/smtpd/lka.c | 6 | ||||
| -rw-r--r-- | usr.sbin/smtpd/mta_session.c | 6 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 6 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 10 |
4 files changed, 17 insertions, 11 deletions
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c index 9baab9811ce..cbe0b5bbc13 100644 --- a/usr.sbin/smtpd/lka.c +++ b/usr.sbin/smtpd/lka.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka.c,v 1.180 2015/11/30 14:05:34 gilles Exp $ */ +/* $OpenBSD: lka.c,v 1.181 2015/12/11 21:44:00 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -168,7 +168,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg) fatalx("lka:ca_vrfy: verify without a certificate"); resp_ca_vrfy.reqid = req_ca_vrfy_smtp->reqid; - pki = dict_xget(env->sc_pki_dict, req_ca_vrfy_smtp->pkiname); + pki = dict_xget(env->sc_pki_dict, req_ca_vrfy_smtp->name); cafile = CA_FILE; if (pki->pki_ca_file) cafile = pki->pki_ca_file; @@ -289,7 +289,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg) fatalx("lka:ca_vrfy: verify without a certificate"); resp_ca_vrfy.reqid = req_ca_vrfy_mta->reqid; - pki = dict_get(env->sc_pki_dict, req_ca_vrfy_mta->pkiname); + pki = dict_get(env->sc_pki_dict, req_ca_vrfy_mta->name); cafile = CA_FILE; if (pki && pki->pki_ca_file) diff --git a/usr.sbin/smtpd/mta_session.c b/usr.sbin/smtpd/mta_session.c index a0e10b6bd17..98acd9c8047 100644 --- a/usr.sbin/smtpd/mta_session.c +++ b/usr.sbin/smtpd/mta_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mta_session.c,v 1.77 2015/12/05 21:27:42 mmcc Exp $ */ +/* $OpenBSD: mta_session.c,v 1.78 2015/12/11 21:44:01 gilles Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -1572,8 +1572,8 @@ mta_verify_certificate(struct mta_session *s) pkiname = s->relay->pki_name; else pkiname = s->helo; - if (strlcpy(req_ca_vrfy.pkiname, pkiname, sizeof req_ca_vrfy.pkiname) - >= sizeof req_ca_vrfy.pkiname) + if (strlcpy(req_ca_vrfy.name, pkiname, sizeof req_ca_vrfy.name) + >= sizeof req_ca_vrfy.name) return 0; x = SSL_get_peer_certificate(s->io.ssl); diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index 7b5dc748fcc..c50f38188b1 100644 --- a/usr.sbin/smtpd/smtp_session.c +++ b/usr.sbin/smtpd/smtp_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtp_session.c,v 1.243 2015/12/11 21:23:42 gilles Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.244 2015/12/11 21:44:01 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -2071,8 +2071,8 @@ smtp_verify_certificate(struct smtp_session *s) pkiname = s->listener->pki_name; else pkiname = s->smtpname; - if (strlcpy(req_ca_vrfy.pkiname, pkiname, sizeof req_ca_vrfy.pkiname) - >= sizeof req_ca_vrfy.pkiname) + if (strlcpy(req_ca_vrfy.name, pkiname, sizeof req_ca_vrfy.name) + >= sizeof req_ca_vrfy.name) return 0; x = SSL_get_peer_certificate(s->io.ssl); diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 1aceaf1efc9..08ef9e74679 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.496 2015/12/11 07:51:38 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.497 2015/12/11 21:44:01 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -1075,7 +1075,7 @@ struct ca_cert_resp_msg { struct ca_vrfy_req_msg { uint64_t reqid; - char pkiname[HOST_NAME_MAX+1]; + char name[HOST_NAME_MAX+1]; unsigned char *cert; off_t cert_len; size_t n_chain; @@ -1210,10 +1210,12 @@ void imsgproc_set_write(struct imsgproc *); void imsgproc_set_read_write(struct imsgproc *); void imsgproc_reset_callback(struct imsgproc *, void (*)(struct imsg *, void *), void *); + /* limit.c */ void limit_mta_set_defaults(struct mta_limits *); int limit_mta_set(struct mta_limits *, const char*, int64_t); + /* lka.c */ pid_t lka(void); @@ -1308,6 +1310,7 @@ struct mta_task *mta_route_next_task(struct mta_relay *, struct mta_route *); const char *mta_host_to_text(struct mta_host *); const char *mta_relay_to_text(struct mta_relay *); + /* mta_session.c */ void mta_session(struct mta_relay *, struct mta_route *); void mta_session_imsg(struct mproc *, struct imsg *); @@ -1342,6 +1345,7 @@ int queue_envelope_update(struct envelope *); int queue_envelope_walk(struct envelope *); int queue_message_walk(struct envelope *, uint32_t, int *, void **); + /* ruleset.c */ struct rule *ruleset_match(const struct envelope *); @@ -1448,6 +1452,7 @@ const char *sockaddr_to_text(struct sockaddr *); const char *mailaddr_to_text(const struct mailaddr *); const char *expandnode_to_text(struct expandnode *); + /* util.c */ typedef struct arglist arglist; struct arglist { @@ -1497,6 +1502,7 @@ int base64_decode(char const *, unsigned char *, size_t); int waitq_wait(void *, void (*)(void *, void *, void *), void *); void waitq_run(void *, void *); + /* runq.c */ struct runq; |