summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-10-28 21:41:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:04:56 -0500
commit08c4d0db0c22e6432e793f88bb93cf631f31ea20 (patch)
tree0312a99db45d4aea18113463f5cfdcb841533187
parent148f07c94b885412250bba7d955c423adac2e5b9 (diff)
downloadsamba-08c4d0db0c22e6432e793f88bb93cf631f31ea20.tar.gz
samba-08c4d0db0c22e6432e793f88bb93cf631f31ea20.tar.bz2
samba-08c4d0db0c22e6432e793f88bb93cf631f31ea20.zip
r3334: Allow disabling IPv6 support using socket:noipv6
(This used to be commit 9c13f42c1fd489a6a663f614a41c59730c18a054)
-rw-r--r--source4/lib/socket/socket.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c
index 84bb1ccafe..dbbae5ea7e 100644
--- a/source4/lib/socket/socket.c
+++ b/source4/lib/socket/socket.c
@@ -269,6 +269,10 @@ const struct socket_ops *socket_getops_byname(const char *name, enum socket_type
#if HAVE_SOCKET_IPV6
if (strcmp("ipv6", name) == 0) {
+ if (lp_parm_bool(-1, "socket", "noipv6", False)) {
+ DEBUG(3, ("IPv6 support was disabled in smb.conf"));
+ return NULL;
+ }
return socket_ipv6_ops();
}
#endif