aboutsummaryrefslogtreecommitdiff
path: root/init.c
diff options
context:
space:
mode:
authorJuanJo Ciarlante <jjo@google.com>2009-09-15 16:48:46 +0200
committerJuanJo Ciarlante <juanjosec@gmail.com>2011-03-25 13:30:29 +0100
commit51afc8b8865fe09f76b81ae341e693a5b16199f2 (patch)
tree7a7dca20b2c3bd00bf2ca8ab1bddd6db32297488 /init.c
parent* socket.c: use USE_PF_INET6 in switch constructs to actually toss them out, (diff)
downloadopenvpn-51afc8b8865fe09f76b81ae341e693a5b16199f2.tar.xz
* support --disable-ipv6 build properly:
- tests now are pass (and fail) properly for ipv6/4 builds * more GNU indenting
Diffstat (limited to '')
-rw-r--r--init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/init.c b/init.c
index e9cb089..ee479cf 100644
--- a/init.c
+++ b/init.c
@@ -3095,11 +3095,11 @@ init_instance (struct context *c, const struct env_set *env, const unsigned int
/* link_socket_mode allows CM_CHILD_TCP
instances to inherit acceptable fds
from a top-level parent */
+ if (c->options.ce.proto == PROTO_TCPv4_SERVER
#ifdef USE_PF_INET6
- if (c->options.ce.proto == PROTO_TCPv4_SERVER || c->options.ce.proto == PROTO_TCPv6_SERVER)
-#else
- if (c->options.ce.proto == PROTO_TCPv4_SERVER)
+ || c->options.ce.proto == PROTO_TCPv6_SERVER
#endif
+ )
{
if (c->mode == CM_TOP)
link_socket_mode = LS_MODE_TCP_LISTEN;