diff options
| -rw-r--r-- | usr.sbin/smtpd/queue_fsqueue_ascii.c | 18 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 3 |
2 files changed, 3 insertions, 18 deletions
diff --git a/usr.sbin/smtpd/queue_fsqueue_ascii.c b/usr.sbin/smtpd/queue_fsqueue_ascii.c index fb49089aa7e..c0c8f97e85b 100644 --- a/usr.sbin/smtpd/queue_fsqueue_ascii.c +++ b/usr.sbin/smtpd/queue_fsqueue_ascii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: queue_fsqueue_ascii.c,v 1.2 2011/10/23 13:03:05 gilles Exp $ */ +/* $OpenBSD: queue_fsqueue_ascii.c,v 1.3 2011/10/23 13:08:18 eric Exp $ */ /* * Copyright (c) 2011 Gilles Chehade <gilles@openbsd.org> @@ -69,7 +69,6 @@ #define KW_MTA_RELAY_PORT "mta-relay-port" #define KW_MTA_RELAY_FLAGS "mta-relay-flags" #define KW_MTA_RELAY_CERT "mta-relay-cert" -#define KW_MTA_RELAY_AS "mta-relay-as" int fsqueue_load_envelope_ascii(FILE *, struct envelope *); int fsqueue_dump_envelope_ascii(FILE *, struct envelope *); @@ -470,18 +469,6 @@ ascii_dump_mta_relay_flags(struct envelope *ep, FILE *fp) } static int -ascii_dump_mta_relay_as(struct envelope *ep, FILE *fp) -{ - if (ep->agent.mta.relay_as.user[0] || - ep->agent.mta.relay_as.domain[0]) - fprintf(fp, "%s: %s@%s\n", KW_MTA_RELAY_AS, - ep->agent.mta.relay_as.user, - ep->agent.mta.relay_as.domain); - return 1; -} - - -static int ascii_load_ctime(struct envelope *ep, char *buf) { const char *errstr; @@ -636,8 +623,7 @@ ascii_dump_agent(struct envelope *ep, FILE *fp) if (! ascii_dump_mta_relay_host(ep, fp) || ! ascii_dump_mta_relay_port(ep, fp) || ! ascii_dump_mta_relay_cert(ep, fp) || - ! ascii_dump_mta_relay_flags(ep, fp) || - ! ascii_dump_mta_relay_as(ep, fp)) + ! ascii_dump_mta_relay_flags(ep, fp)) return 0; break; diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index ffcedc34859..6efa774c4b1 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.244 2011/10/23 13:03:05 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.245 2011/10/23 13:08:18 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -380,7 +380,6 @@ struct delivery_mda { struct delivery_mta { struct relayhost relay; - struct mailaddr relay_as; }; enum expand_type { |