Index: source/web_server/web_server.c
===================================================================
--- source/web_server/web_server.c	(revision 23003)
+++ source/web_server/web_server.c	(working copy)
@@ -257,14 +257,14 @@
 			const char *address = iface_n_ip(i);
 			status = stream_setup_socket(task->event_ctx, model_ops, 
 						     &web_stream_ops, 
-						     "ipv4", address, 
+						     "ipv6", address, 
 						     &port, task);
 			if (!NT_STATUS_IS_OK(status)) goto failed;
 		}
 	} else {
 		status = stream_setup_socket(task->event_ctx, model_ops, 
 					     &web_stream_ops, 
-					     "ipv4", lp_socket_address(), 
+					     "ipv6", lp_socket_address(), 
 					     &port, task);
 		if (!NT_STATUS_IS_OK(status)) goto failed;
 	}
Index: source/ldap_server/ldap_server.c
===================================================================
--- source/ldap_server/ldap_server.c	(revision 23003)
+++ source/ldap_server/ldap_server.c	(working copy)
@@ -450,7 +450,7 @@
 	int options;
 
 	status = stream_setup_socket(event_context, model_ops, &ldap_stream_ops, 
-				     "ipv4", address, &port, ldap_service);
+				     "ipv6", address, &port, ldap_service);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
 			 address, port, nt_errstr(status)));
@@ -460,7 +460,7 @@
 		/* add ldaps server */
 		port = 636;
 		status = stream_setup_socket(event_context, model_ops, &ldap_stream_ops, 
-					     "ipv4", address, &port, ldap_service);
+					     "ipv6", address, &port, ldap_service);
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
 				 address, port, nt_errstr(status)));
@@ -491,7 +491,7 @@
 	if (options & 0x000000001) {
 		port = 3268;
 		status = stream_setup_socket(event_context, model_ops, &ldap_stream_ops, 
-					     "ipv4", address, &port, ldap_service);
+					     "ipv6", address, &port, ldap_service);
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
 				 address, port, nt_errstr(status)));
Index: source/smb_server/smb_server.c
===================================================================
--- source/smb_server/smb_server.c	(revision 23003)
+++ source/smb_server/smb_server.c	(working copy)
@@ -185,7 +185,7 @@
 		uint16_t port = atoi(ports[i]);
 		if (port == 0) continue;
 		status = stream_setup_socket(event_context, model_ops, &smb_stream_ops, 
-					     "ipv4", address, &port, NULL);
+					     "ipv6", address, &port, NULL);
 		NT_STATUS_NOT_OK_RETURN(status);
 	}
 
Index: source/rpc_server/dcerpc_sock.c
===================================================================
--- source/rpc_server/dcerpc_sock.c	(revision 23003)
+++ source/rpc_server/dcerpc_sock.c	(working copy)
@@ -336,7 +336,7 @@
 	dcesrv_sock->dcesrv_ctx		= talloc_reference(dcesrv_sock, dce_ctx);
 
 	status = stream_setup_socket(event_ctx, model_ops, &dcesrv_stream_ops, 
-				     "ipv4", address, &port, dcesrv_sock);
+				     "ipv6", address, &port, dcesrv_sock);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("service_setup_stream_socket(address=%s,port=%u) failed - %s\n", 
 			 address, port, nt_errstr(status)));
Index: source/kdc/kdc.c
===================================================================
--- source/kdc/kdc.c	(revision 23003)
+++ source/kdc/kdc.c	(working copy)
@@ -422,13 +422,13 @@
 	kpasswd_socket = talloc(kdc, struct kdc_socket);
 	NT_STATUS_HAVE_NO_MEMORY(kpasswd_socket);
 
-	status = socket_create("ip", SOCKET_TYPE_DGRAM, &kdc_socket->sock, 0);
+	status = socket_create("ipv6", SOCKET_TYPE_DGRAM, &kdc_socket->sock, 0);
 	if (!NT_STATUS_IS_OK(status)) {
 		talloc_free(kdc_socket);
 		return status;
 	}
 
-	status = socket_create("ip", SOCKET_TYPE_DGRAM, &kpasswd_socket->sock, 0);
+	status = socket_create("ipv6", SOCKET_TYPE_DGRAM, &kpasswd_socket->sock, 0);
 	if (!NT_STATUS_IS_OK(status)) {
 		talloc_free(kpasswd_socket);
 		return status;
@@ -490,7 +490,7 @@
 
 	status = stream_setup_socket(kdc->task->event_ctx, model_ops, 
 				     &kdc_tcp_stream_ops, 
-				     "ip", address, &kdc_port, kdc);
+				     "ipv6", address, &kdc_port, kdc);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("Failed to bind to %s:%u TCP - %s\n",
 			 address, kdc_port, nt_errstr(status)));
@@ -500,7 +500,7 @@
 
 	status = stream_setup_socket(kdc->task->event_ctx, model_ops, 
 				     &kpasswdd_tcp_stream_ops, 
-				     "ip", address, &kpasswd_port, kdc);
+				     "ipv6", address, &kpasswd_port, kdc);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("Failed to bind to %s:%u TCP - %s\n",
 			 address, kpasswd_port, nt_errstr(status)));
@@ -522,13 +522,9 @@
 	NTSTATUS status;
 	
 	int i;
-	
-	for (i=0; i<num_interfaces; i++) {
-		const char *address = talloc_strdup(tmp_ctx, iface_n_ip(i));
-		status = kdc_add_socket(kdc, address);
-		NT_STATUS_NOT_OK_RETURN(status);
-	}
 
+	NT_STATUS_NOT_OK_RETURN(kdc_add_socket(kdc, "::"));
+	
 	talloc_free(tmp_ctx);
 
 	return NT_STATUS_OK;