summaryrefslogtreecommitdiff
path: root/source4/lib/socket
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-12-17 17:04:09 +0100
committerVolker Lendecke <vlendec@samba.org>2011-12-17 18:41:39 +0100
commit79fe4bbf731272ea21f34bd2653673fe1a34e2c4 (patch)
treef373172934f9a487205ac1e6c4b5de9f44628e86 /source4/lib/socket
parent23a034335cb25a7e1a7a5ba0ba007e23d379623e (diff)
downloadsamba-79fe4bbf731272ea21f34bd2653673fe1a34e2c4.tar.gz
samba-79fe4bbf731272ea21f34bd2653673fe1a34e2c4.tar.bz2
samba-79fe4bbf731272ea21f34bd2653673fe1a34e2c4.zip
s3: Fix the clustering build
ctdb_private.h already defines set_close_on_exec. Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Sat Dec 17 18:41:39 CET 2011 on sn-devel-104
Diffstat (limited to 'source4/lib/socket')
-rw-r--r--source4/lib/socket/socket_ip.c4
-rw-r--r--source4/lib/socket/socket_unix.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/socket/socket_ip.c b/source4/lib/socket/socket_ip.c
index d2d57798d4..d531053add 100644
--- a/source4/lib/socket/socket_ip.c
+++ b/source4/lib/socket/socket_ip.c
@@ -50,7 +50,7 @@ static NTSTATUS ipv4_init(struct socket_context *sock)
return map_nt_error_from_unix_common(errno);
}
- set_close_on_exec(sock->fd);
+ smb_set_close_on_exec(sock->fd);
sock->backend_name = "ipv4";
sock->family = AF_INET;
@@ -612,7 +612,7 @@ static NTSTATUS ipv6_init(struct socket_context *sock)
return map_nt_error_from_unix_common(errno);
}
- set_close_on_exec(sock->fd);
+ smb_set_close_on_exec(sock->fd);
sock->backend_name = "ipv6";
sock->family = AF_INET6;
diff --git a/source4/lib/socket/socket_unix.c b/source4/lib/socket/socket_unix.c
index ab9b06df1b..2909ecca8f 100644
--- a/source4/lib/socket/socket_unix.c
+++ b/source4/lib/socket/socket_unix.c
@@ -59,7 +59,7 @@ static NTSTATUS unixdom_init(struct socket_context *sock)
sock->backend_name = "unix";
- set_close_on_exec(sock->fd);
+ smb_set_close_on_exec(sock->fd);
return NT_STATUS_OK;
}
@@ -200,7 +200,7 @@ static NTSTATUS unixdom_accept(struct socket_context *sock,
}
}
- set_close_on_exec(new_fd);
+ smb_set_close_on_exec(new_fd);
(*new_sock) = talloc(NULL, struct socket_context);
if (!(*new_sock)) {