diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-12-08 22:40:58 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-12-08 22:40:58 +0000 |
| commit | 7a2fa0bc49edcd925d51605836f0132a130e0167 (patch) | |
| tree | 904df36d9528bba1f9d1b655ebaa745bc59b298a | |
| parent | 4058e3f6d73fe51173d12911416133284749b778 (diff) | |
PROXY: fix mismerge
| -rw-r--r-- | src/src/readconf.c | 2 | ||||
| -rw-r--r-- | src/src/smtp_in.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/src/readconf.c b/src/src/readconf.c index cba33ac35..9b0b26e42 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -286,7 +286,7 @@ static optionlist optionlist_config[] = { { "host_reject_connection", opt_stringptr, &host_reject_connection }, { "hosts_connection_nolog", opt_stringptr, &hosts_connection_nolog }, #ifdef SUPPORT_PROXY - { "hosts_proxy", opt_stringptr, &proxy_required_hosts }, + { "hosts_proxy", opt_stringptr, &hosts_proxy }, #endif { "hosts_treat_as_local", opt_stringptr, &hosts_treat_as_local }, #ifdef LOOKUP_IBASE diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index a5ed2f9b7..86b0d21cf 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -620,7 +620,7 @@ int rc; /* Cannot configure local connection as a proxy inbound */ if (sender_host_address == NULL) return proxy_session; -rc = verify_check_this_host(&hosts_proxy, NULL, NULL, +rc = verify_check_this_host(CUSS &hosts_proxy, NULL, NULL, sender_host_address, NULL); if (rc == OK) { @@ -774,9 +774,9 @@ if (ret >= 16 && DEBUG(D_receive) debug_printf("Invalid %s dest port\n", iptype); return ERRNO_PROXYFAIL; } - proxy_target_address = string_copy(US tmpip); + proxy_external_address = string_copy(US tmpip); tmpport = ntohs(hdr.v2.addr.ip4.dst_port); - proxy_target_port = tmpport; + proxy_external_port = tmpport; goto done; case 0x21: /* TCPv6 address type */ iptype = US"IPv6"; @@ -800,9 +800,9 @@ if (ret >= 16 && DEBUG(D_receive) debug_printf("Invalid %s dest port\n", iptype); return ERRNO_PROXYFAIL; } - proxy_target_address = string_copy(US tmpip6); + proxy_external_address = string_copy(US tmpip6); tmpport = ntohs(hdr.v2.addr.ip6.dst_port); - proxy_target_port = tmpport; + proxy_external_port = tmpport; goto done; default: DEBUG(D_receive) @@ -897,7 +897,7 @@ else if (ret >= 8 && debug_printf("Proxy dest arg is not an %s address\n", iptype); goto proxyfail; } - proxy_target_address = p; + proxy_external_address = p; p = sp + 1; if ((sp = Ustrchr(p, ' ')) == NULL) { @@ -927,7 +927,7 @@ else if (ret >= 8 && debug_printf("Proxy dest port '%s' not an integer\n", p); goto proxyfail; } - proxy_target_port = tmp_port; + proxy_external_port = tmp_port; /* Already checked for /r /n above. Good V1 header received. */ goto done; } |