summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-10-22 10:52:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:02:25 -0500
commit8debe5a6b88c9625826e191b04244ae3e4b42590 (patch)
treef7a9bf2a71e2217ca3052a048f2c5cdf67168885 /source4/smbd
parent020b38656016d3adeeaa9b09d41ea0c29f686ed4 (diff)
downloadsamba-8debe5a6b88c9625826e191b04244ae3e4b42590.tar.gz
samba-8debe5a6b88c9625826e191b04244ae3e4b42590.tar.bz2
samba-8debe5a6b88c9625826e191b04244ae3e4b42590.zip
r3136: - Allow specifying socket type when adding smbd service
- Make sure a epm_tower struct is completely initialized - Some more minor fixes (This used to be commit d560dcbdb85cb2c6915bdb9e2f82f1872b0f5a52)
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/service.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/smbd/service.c b/source4/smbd/service.c
index d4ba9c990c..ac46992261 100644
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -88,6 +88,7 @@ struct server_context *server_service_startup(const char *model)
*/
struct server_socket *service_setup_socket(struct server_service *service,
const struct model_ops *model_ops,
+ const char *family,
const char *sock_addr,
uint16_t *port)
{
@@ -97,7 +98,7 @@ struct server_socket *service_setup_socket(struct server_service *service,
struct fd_event fde;
int i;
- status = socket_create("ipv4", SOCKET_TYPE_STREAM, &socket_ctx, 0);
+ status = socket_create(family, SOCKET_TYPE_STREAM, &socket_ctx, 0);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("Failed to open socket on %s:%u - %s\n",
sock_addr, *port, nt_errstr(status)));