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 /lib/util | |
| 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 'lib/util')
| -rw-r--r-- | lib/util/blocking.c | 2 | ||||
| -rw-r--r-- | lib/util/genrand.c | 6 | ||||
| -rw-r--r-- | lib/util/samba_util.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/util/blocking.c b/lib/util/blocking.c index 9dede7aa0d..157804a5be 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 b8d3c78fa1..57884ef791 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 3b5169d744..95bf7fd743 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. |