diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2018-10-08 10:04:24 +0200 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2018-10-08 10:04:24 +0200 |
| commit | 66e09f6d1d724d49d28db076cdf333df1e265dfd (patch) | |
| tree | 5f56562ebf49d90f9097ba4d1ee6329f4457cd28 /smtpd/smtpd.h | |
| parent | sync with openbsd (diff) | |
| download | OpenSMTPD-66e09f6d1d724d49d28db076cdf333df1e265dfd.tar.xz OpenSMTPD-66e09f6d1d724d49d28db076cdf333df1e265dfd.zip | |
sync with OpenBSDopensmtpd-6.4.0
Diffstat (limited to 'smtpd/smtpd.h')
| -rw-r--r-- | smtpd/smtpd.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/smtpd/smtpd.h b/smtpd/smtpd.h index bd3de8cb..89b01e4f 100644 --- a/smtpd/smtpd.h +++ b/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.558 2018/09/04 13:04:42 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.562 2018/09/24 16:14:34 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -84,14 +84,12 @@ #define F_RECEIVEDAUTH 0x800 #define F_MASQUERADE 0x1000 +#define RELAY_TLS_OPPORTUNISTIC 0 +#define RELAY_TLS_STARTTLS 1 +#define RELAY_TLS_SMTPS 2 +#define RELAY_TLS_NO 3 -#define RELAY_STARTTLS 0x01 -#define RELAY_SMTPS 0x02 -#define RELAY_TLS_OPTIONAL 0x04 -#define RELAY_SSL (RELAY_STARTTLS | RELAY_SMTPS) #define RELAY_AUTH 0x08 -#define RELAY_BACKUP 0x10 -#define RELAY_MX 0x20 #define RELAY_LMTP 0x80 #define RELAY_TLS_VERIFY 0x200 @@ -115,6 +113,7 @@ struct netaddr { struct relayhost { uint16_t flags; + int tls; char hostname[HOST_NAME_MAX+1]; uint16_t port; char authlabel[PATH_MAX]; @@ -627,7 +626,7 @@ struct mta_mx { struct mta_domain { SPLAY_ENTRY(mta_domain) entry; char *name; - int flags; + int as_host; TAILQ_HEAD(, mta_mx) mxs; int mxstatus; int refcount; @@ -732,6 +731,7 @@ struct mta_relay { struct dispatcher *dispatcher; struct mta_domain *domain; struct mta_limits *limits; + int tls; int flags; char *backupname; int backuppref; @@ -1063,6 +1063,7 @@ struct dispatcher_remote { char *smarthost; char *auth; + int tls_required; int tls_noverify; int backup; |