diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2015-09-15 11:23:33 +0200 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2015-09-15 13:32:17 +0200 |
| commit | 8db23a57c878abd5b01c784c7db570176de555ef (patch) | |
| tree | a5aba869b217fafb5e4c800d94693c4a1b14bb83 /src/openvpn/multi.c | |
| parent | 429f0560e3a908ffa00f18ba1a81af03ba05751e (diff) | |
| download | openvpn-8db23a57c878abd5b01c784c7db570176de555ef.tar.gz openvpn-8db23a57c878abd5b01c784c7db570176de555ef.tar.xz openvpn-8db23a57c878abd5b01c784c7db570176de555ef.zip | |
Remove #ifdefs for client nat support.
The client-nat feature was always unconditionally enabled
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1442309019-7586-3-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/10109
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/multi.c')
| -rw-r--r-- | src/openvpn/multi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index b0f66ca..902c4dc 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1311,9 +1311,7 @@ multi_select_virtual_addr (struct multi_context *m, struct multi_instance *mi) mi->context.c2.push_ifconfig_defined = true; mi->context.c2.push_ifconfig_local = mi->context.options.push_ifconfig_local; mi->context.c2.push_ifconfig_remote_netmask = mi->context.options.push_ifconfig_remote_netmask; -#ifdef ENABLE_CLIENT_NAT mi->context.c2.push_ifconfig_local_alias = mi->context.options.push_ifconfig_local_alias; -#endif /* the current implementation does not allow "static IPv4, pool IPv6", * (see below) so issue a warning if that happens - don't break the |