diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2012-11-15 13:23:23 +0100 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2012-11-15 13:23:23 +0100 |
| commit | 0d836d20c739387fb3c6063318602104134e7fbb (patch) | |
| tree | c0741bca13c431f0f70cfe73e565df9639c1452f | |
| parent | PURGE_MAPS -> PURGE_TABLES (diff) | |
| download | OpenSMTPD-0d836d20c739387fb3c6063318602104134e7fbb.tar.xz OpenSMTPD-0d836d20c739387fb3c6063318602104134e7fbb.zip | |
authmap -> authtable
| -rw-r--r-- | smtpd/envelope.c | 16 | ||||
| -rw-r--r-- | smtpd/mta.c | 2 | ||||
| -rw-r--r-- | smtpd/parse.y | 4 | ||||
| -rw-r--r-- | smtpd/smtpd.h | 5 |
4 files changed, 17 insertions, 10 deletions
diff --git a/smtpd/envelope.c b/smtpd/envelope.c index 09009487..5235b5ba 100644 --- a/smtpd/envelope.c +++ b/smtpd/envelope.c @@ -110,7 +110,8 @@ envelope_load_buffer(struct envelope *ep, char *buf, size_t buflen) EVP_MTA_RELAY_PORT, EVP_MTA_RELAY_CERT, EVP_MTA_RELAY_FLAGS, - EVP_MTA_RELAY_AUTHMAP + EVP_MTA_RELAY_AUTHMAP, + EVP_MTA_RELAY_AUTHTABLE }; char *field, *nextline; size_t len; @@ -192,7 +193,7 @@ envelope_dump_buffer(struct envelope *ep, char *dest, size_t len) EVP_MTA_RELAY_HOST, EVP_MTA_RELAY_PORT, EVP_MTA_RELAY_CERT, - EVP_MTA_RELAY_AUTHMAP, + EVP_MTA_RELAY_AUTHTABLE, EVP_MTA_RELAY_FLAGS }; enum envelope_field *pfields = NULL; @@ -306,6 +307,8 @@ envelope_ascii_field_name(enum envelope_field field) return "mta-relay-cert"; case EVP_MTA_RELAY_AUTHMAP: return "mta-relay-authmap"; + case EVP_MTA_RELAY_AUTHTABLE: + return "mta-relay-authtable"; } return NULL; @@ -363,8 +366,9 @@ envelope_ascii_load(enum envelope_field field, struct envelope *ep, char *buf) return ascii_load_mta_relay_flags(&ep->agent.mta.relay.flags, buf); case EVP_MTA_RELAY_AUTHMAP: - return ascii_load_string(ep->agent.mta.relay.authmap, buf, - sizeof ep->agent.mta.relay.authmap); + case EVP_MTA_RELAY_AUTHTABLE: + return ascii_load_string(ep->agent.mta.relay.authtable, buf, + sizeof ep->agent.mta.relay.authtable); case EVP_CTIME: return ascii_load_time(&ep->creation, buf); case EVP_EXPIRE: @@ -423,7 +427,9 @@ envelope_ascii_dump(enum envelope_field field, struct envelope *ep, return ascii_dump_mta_relay_flags(ep->agent.mta.relay.flags, buf, len); case EVP_MTA_RELAY_AUTHMAP: - return ascii_dump_string(ep->agent.mta.relay.authmap, + return 1; + case EVP_MTA_RELAY_AUTHTABLE: + return ascii_dump_string(ep->agent.mta.relay.authtable, buf, len); case EVP_CTIME: return ascii_dump_time(ep->creation, buf, len); diff --git a/smtpd/mta.c b/smtpd/mta.c index 4e414c07..fdf005b5 100644 --- a/smtpd/mta.c +++ b/smtpd/mta.c @@ -428,7 +428,7 @@ mta_route_for(struct envelope *e) key.cert = e->agent.mta.relay.cert; if (!key.cert[0]) key.cert = NULL; - key.auth = e->agent.mta.relay.authmap; + key.auth = e->agent.mta.relay.authtable; if (!key.auth[0]) key.auth = NULL; diff --git a/smtpd/parse.y b/smtpd/parse.y index 1bdaa83a..415f9e2e 100644 --- a/smtpd/parse.y +++ b/smtpd/parse.y @@ -741,8 +741,8 @@ action : DELIVER TO MAILDIR { YYERROR; } m = map_find($5); - strlcpy(rule->r_value.relayhost.authmap, m->m_name, - sizeof(rule->r_value.relayhost.authmap)); + strlcpy(rule->r_value.relayhost.authtable, m->m_name, + sizeof(rule->r_value.relayhost.authtable)); } if ($4 != NULL) { diff --git a/smtpd/smtpd.h b/smtpd/smtpd.h index 32017db5..13c96d51 100644 --- a/smtpd/smtpd.h +++ b/smtpd/smtpd.h @@ -128,7 +128,7 @@ struct relayhost { char hostname[MAXHOSTNAMELEN]; uint16_t port; char cert[PATH_MAX]; - char authmap[MAX_PATH_SIZE]; + char authtable[MAX_PATH_SIZE]; }; enum imsg_type { @@ -478,7 +478,8 @@ enum envelope_field { EVP_MTA_RELAY_PORT, EVP_MTA_RELAY_FLAGS, EVP_MTA_RELAY_CERT, - EVP_MTA_RELAY_AUTHMAP + EVP_MTA_RELAY_AUTHMAP, + EVP_MTA_RELAY_AUTHTABLE }; |