diff options
| author | Volker Lendecke <vl@samba.org> | 2011-12-17 17:04:09 +0100 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-12-17 18:41:39 +0100 |
| commit | 79fe4bbf731272ea21f34bd2653673fe1a34e2c4 (patch) | |
| tree | f373172934f9a487205ac1e6c4b5de9f44628e86 /source4 | |
| parent | 23a034335cb25a7e1a7a5ba0ba007e23d379623e (diff) | |
| download | samba-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')
| -rw-r--r-- | source4/lib/socket/socket_ip.c | 4 | ||||
| -rw-r--r-- | source4/lib/socket/socket_unix.c | 4 | ||||
| -rw-r--r-- | source4/smbd/pidfile.c | 2 |
3 files changed, 5 insertions, 5 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)) { diff --git a/source4/smbd/pidfile.c b/source4/smbd/pidfile.c index 85a6322ff7..b7d1c27cd0 100644 --- a/source4/smbd/pidfile.c +++ b/source4/smbd/pidfile.c @@ -107,7 +107,7 @@ void pidfile_create(const char *piddir, const char *name) exit(1); } - set_close_on_exec(fd); + smb_set_close_on_exec(fd); if (fcntl_lock(fd,F_SETLK,0,1,F_WRLCK)==false) { DEBUG(0,("ERROR: %s : fcntl lock of file %s failed. Error was %s\n", |