[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  79fe4bb s3: Fix the clustering build
      from  23a0343 libcli/util: add NT_STATUS_NETWORK_SESSION_EXPIRED and NT_STATUS_ALL_SIDS_FILTERED

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 79fe4bbf731272ea21f34bd2653673fe1a34e2c4
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Dec 17 17:04:09 2011 +0100

    s3: Fix the clustering build
    
    ctdb_private.h already defines set_close_on_exec.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sat Dec 17 18:41:39 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 lib/util/blocking.c              |    2 +-
 lib/util/genrand.c               |    6 +++---
 lib/util/samba_util.h            |    2 +-
 source4/lib/socket/socket_ip.c   |    4 ++--
 source4/lib/socket/socket_unix.c |    4 ++--
 source4/smbd/pidfile.c           |    2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/blocking.c b/lib/util/blocking.c
index 9dede7a..157804a 100644
--- a/lib/util/blocking.c
+++ b/lib/util/blocking.c
@@ -62,7 +62,7 @@ _PUBLIC_ int set_blocking(int fd, bool set)
 }
 
 
-_PUBLIC_ bool set_close_on_exec(int fd)
+_PUBLIC_ bool smb_set_close_on_exec(int fd)
 {
 #ifdef FD_CLOEXEC
 	int val;
diff --git a/lib/util/genrand.c b/lib/util/genrand.c
index b8d3c78..57884ef 100644
--- a/lib/util/genrand.c
+++ b/lib/util/genrand.c
@@ -173,7 +173,7 @@ static int do_reseed(bool use_fd, int fd)
 		if (fd == -1) {
 			fd = open( "/dev/urandom", O_RDONLY,0);
 			if (fd != -1) {
-				set_close_on_exec(fd);
+				smb_set_close_on_exec(fd);
 			}
 		}
 		if (fd != -1
@@ -236,7 +236,7 @@ _PUBLIC_ void generate_random_buffer(uint8_t *out, int len)
 			if (urand_fd == -1) {
 				urand_fd = open( "/dev/urandom", O_RDONLY,0);
 				if (urand_fd != -1) {
-					set_close_on_exec(urand_fd);
+					smb_set_close_on_exec(urand_fd);
 				}
 			}
 			if(urand_fd != -1 && (read(urand_fd, out, len) == len)) {
@@ -276,7 +276,7 @@ _PUBLIC_ void generate_secret_buffer(uint8_t *out, int len)
 	if (urand_fd == -1) {
 		urand_fd = open( "/dev/urandom", O_RDONLY,0);
 		if (urand_fd != -1) {
-			set_close_on_exec(urand_fd);
+			smb_set_close_on_exec(urand_fd);
 		}
 	}
 	if(urand_fd != -1 && (read(urand_fd, out, len) == len)) {
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index 3b5169d..95bf7fd 100644
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -670,7 +670,7 @@ _PUBLIC_ int set_blocking(int fd, bool set);
 /**
    set close on exec on a file descriptor if available
  **/
-_PUBLIC_ bool set_close_on_exec(int fd);
+_PUBLIC_ bool smb_set_close_on_exec(int fd);
 
 /**
  Sleep for a specified number of milliseconds.
diff --git a/source4/lib/socket/socket_ip.c b/source4/lib/socket/socket_ip.c
index d2d5779..d531053 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 ab9b06d..2909ecc 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 85a6322..b7d1c27 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",  


-- 
Samba Shared Repository