diff options
| author |   gilles <gilles@openbsd.org> | 2015-11-30 14:32:00 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2015-11-30 14:32:00 +0000 |
| commit | 5f0be8e71827cea19ba7082efa48513bf2b744a3 (patch) | |
| tree | a90c1c1e9bd70b99180696fb618983576c77082b | |
| parent | add ca_name field to some structures in preparation for a larger (diff) | |
| download | wireguard-openbsd-5f0be8e71827cea19ba7082efa48513bf2b744a3.tar.xz wireguard-openbsd-5f0be8e71827cea19ba7082efa48513bf2b744a3.zip | |
if a ca_name is set, dump it to on-disk envelope so we recall it on reload.
we don't set ca_name yet, it is part of a larger diff i'm splitting
| -rw-r--r-- | usr.sbin/smtpd/envelope.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/envelope.c b/usr.sbin/smtpd/envelope.c index a64caa7da4d..6a5d67de087 100644 --- a/usr.sbin/smtpd/envelope.c +++ b/usr.sbin/smtpd/envelope.c @@ -1,4 +1,4 @@ -/* $OpenBSD: envelope.c,v 1.33 2015/11/30 12:26:55 sunil Exp $ */ +/* $OpenBSD: envelope.c,v 1.34 2015/11/30 14:32:00 gilles Exp $ */ /* * Copyright (c) 2013 Eric Faurot <eric@openbsd.org> @@ -220,6 +220,7 @@ envelope_dump_buffer(const struct envelope *ep, char *dest, size_t len) envelope_ascii_dump(ep, &dest, &len, "mta-relay"); envelope_ascii_dump(ep, &dest, &len, "mta-relay-auth"); envelope_ascii_dump(ep, &dest, &len, "mta-relay-cert"); + envelope_ascii_dump(ep, &dest, &len, "mta-relay-ca"); envelope_ascii_dump(ep, &dest, &len, "mta-relay-flags"); envelope_ascii_dump(ep, &dest, &len, "mta-relay-heloname"); envelope_ascii_dump(ep, &dest, &len, "mta-relay-helotable"); @@ -510,6 +511,10 @@ ascii_load_field(const char *field, struct envelope *ep, char *buf) return ascii_load_string(ep->agent.mta.relay.pki_name, buf, sizeof ep->agent.mta.relay.pki_name); + if (strcasecmp("mta-relay-ca", field) == 0) + return ascii_load_string(ep->agent.mta.relay.ca_name, buf, + sizeof ep->agent.mta.relay.ca_name); + if (strcasecmp("mta-relay-flags", field) == 0) return ascii_load_mta_relay_flags(&ep->agent.mta.relay.flags, buf); @@ -839,6 +844,10 @@ ascii_dump_field(const char *field, const struct envelope *ep, return ascii_dump_string(ep->agent.mta.relay.pki_name, buf, len); + if (strcasecmp(field, "mta-relay-ca") == 0) + return ascii_dump_string(ep->agent.mta.relay.ca_name, + buf, len); + if (strcasecmp(field, "mta-relay-flags") == 0) return ascii_dump_mta_relay_flags(ep->agent.mta.relay.flags, buf, len); |