summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/util/config.mk3
-rw-r--r--lib/util/select.c (renamed from source3/lib/select.c)19
-rw-r--r--lib/util/select.h29
-rw-r--r--lib/util/wscript_build2
-rw-r--r--source3/Makefile.in5
-rw-r--r--source3/client/client.c1
-rw-r--r--source3/include/proto.h6
-rw-r--r--source3/lib/events.c1
-rw-r--r--source3/lib/g_lock.c1
-rw-r--r--source3/lib/packet.c1
-rw-r--r--source3/lib/readline.c1
-rw-r--r--source3/lib/util_sock.c1
-rw-r--r--source3/libsmb/nmblib.c1
-rw-r--r--source3/nmbd/nmbd_packets.c1
-rw-r--r--source3/smbd/process.c1
-rw-r--r--source3/utils/smbfilter.c1
-rw-r--r--source3/winbindd/winbindd_dual.c1
-rw-r--r--source3/wscript_build5
-rw-r--r--source4/lib/smbreadline/smbreadline.c45
19 files changed, 60 insertions, 65 deletions
diff --git a/lib/util/config.mk b/lib/util/config.mk
index 0a5d62ff86..719f5f2493 100644
--- a/lib/util/config.mk
+++ b/lib/util/config.mk
@@ -35,7 +35,8 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
smb_threads.o \
params.o \
parmlist.o \
- util_id.o)
+ util_id.o
+ select.o)
PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
dlinklist.h \
diff --git a/source3/lib/select.c b/lib/util/select.c
index 846e6af1de..61df649526 100644
--- a/source3/lib/select.c
+++ b/lib/util/select.c
@@ -1,29 +1,32 @@
-/*
+/*
Unix SMB/Netbios implementation.
Version 3.0
Samba select/poll implementation
Copyright (C) Andrew Tridgell 1992-1998
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
+#include "system/filesys.h"
+#include "system/select.h"
+#include "lib/util/select.h"
-/* This is here because it allows us to avoid a nasty race in signal handling.
+/* This is here because it allows us to avoid a nasty race in signal handling.
We need to guarantee that when we get a signal we get out of a select immediately
- but doing that involves a race condition. We can avoid the race by getting the
- signal handler to write to a pipe that is in the select/poll list
+ but doing that involves a race condition. We can avoid the race by getting the
+ signal handler to write to a pipe that is in the select/poll list
This means all Samba signal handlers should call sys_select_signal().
*/
@@ -33,7 +36,7 @@ static int select_pipe[2];
static volatile unsigned pipe_written, pipe_read;
/*******************************************************************
- Call this from all Samba signal handlers if you want to avoid a
+ Call this from all Samba signal handlers if you want to avoid a
nasty signal race condition.
********************************************************************/
diff --git a/lib/util/select.h b/lib/util/select.h
new file mode 100644
index 0000000000..13c85ce0bf
--- /dev/null
+++ b/lib/util/select.h
@@ -0,0 +1,29 @@
+/*
+ Unix SMB/Netbios implementation.
+ Samba select/poll implementation
+ Copyright (C) Andrew Tridgell 1992-1998
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _select_h_
+#define _select_h_
+
+/* The following definitions come from lib/util/select.c */
+
+void sys_select_signal(char c);
+int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *tval);
+int sys_select_intr(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *tval);
+
+#endif
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 0da6ec5b26..457dee2e19 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
bld.SAMBA_LIBRARY('LIBSAMBA-UTIL',
- source='xfile.c debug.c fault.c signal.c system.c time.c genrand.c dprintf.c util_str.c rfc1738.c substitute.c util_strlist.c util_file.c data_blob.c util.c blocking.c util_net.c fsusage.c ms_fnmatch.c mutex.c idtree.c become_daemon.c rbtree.c talloc_stack.c smb_threads.c params.c parmlist.c util_id.c',
+ source='xfile.c debug.c fault.c signal.c system.c time.c genrand.c dprintf.c util_str.c rfc1738.c substitute.c util_strlist.c util_file.c data_blob.c util.c blocking.c util_net.c fsusage.c ms_fnmatch.c mutex.c idtree.c become_daemon.c rbtree.c talloc_stack.c smb_threads.c params.c parmlist.c util_id.c select.c',
public_deps='talloc LIBCRYPTO CHARSET execinfo UID_WRAPPER tevent',
public_headers='attr.h byteorder.h data_blob.h debug.h memory.h mutex.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h tevent_ntstatus.h tevent_unix.h',
header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8a0364d174..139ea70909 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -430,7 +430,8 @@ UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \
../lib/util/become_daemon.o ../lib/util/system.o \
../lib/util/tevent_unix.o ../lib/util/tevent_ntstatus.o \
../lib/util/smb_threads.o ../lib/util/util_id.o \
- ../lib/util/blocking.o ../lib/util/rfc1738.o
+ ../lib/util/blocking.o ../lib/util/rfc1738.o \
+ ../lib/util/select.o
CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \
../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \
@@ -460,7 +461,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
lib/util.o lib/util_names.o \
lib/util_sock.o lib/sock_exec.o lib/util_sec.o \
lib/substitute.o lib/dbwrap_util.o \
- lib/ms_fnmatch.o lib/select.o lib/errmap_unix.o \
+ lib/ms_fnmatch.o lib/errmap_unix.o \
lib/tallocmsg.o lib/dmallocmsg.o \
libsmb/clisigning.o libsmb/smb_signing.o \
lib/iconv.o lib/pam_errors.o intl/lang_tdb.o \
diff --git a/source3/client/client.c b/source3/client/client.c
index 86d64f6afa..1432d95c22 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -25,6 +25,7 @@
#include "popt_common.h"
#include "client/client_proto.h"
#include "../librpc/gen_ndr/cli_srvsvc.h"
+#include "../lib/util/select.h"
#ifndef REGISTER
#define REGISTER 0
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 866836f99f..d19ce81a44 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -716,12 +716,6 @@ NTSTATUS se_create_child_secdesc_buf(TALLOC_CTX *ctx,
const struct security_descriptor *parent_ctr,
bool container);
-/* The following definitions come from lib/select.c */
-
-void sys_select_signal(char c);
-int sys_select(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *tval);
-int sys_select_intr(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *tval);
-
/* The following definitions come from lib/sendfile.c */
ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T offset, size_t count);
diff --git a/source3/lib/events.c b/source3/lib/events.c
index 21a13b63fb..70a0d7c302 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include <tevent_internal.h>
+#include "../lib/util/select.h"
/*
* Return if there's something in the queue
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 2c065029e7..378e464b5c 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -21,6 +21,7 @@
#include "g_lock.h"
#include "librpc/gen_ndr/messaging.h"
#include "ctdbd_conn.h"
+#include "../lib/util/select.h"
static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx, const char *name,
struct server_id pid);
diff --git a/source3/lib/packet.c b/source3/lib/packet.c
index c131b973bc..fefb74a0c5 100644
--- a/source3/lib/packet.c
+++ b/source3/lib/packet.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "../lib/util/select.h"
struct packet_context {
int fd;
diff --git a/source3/lib/readline.c b/source3/lib/readline.c
index 4b82291eca..1be0e05f7d 100644
--- a/source3/lib/readline.c
+++ b/source3/lib/readline.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "../lib/util/select.h"
#ifdef HAVE_LIBREADLINE
# ifdef HAVE_READLINE_READLINE_H
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 2b33816293..188e11702e 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "memcache.h"
#include "../lib/async_req/async_sock.h"
+#include "../lib/util/select.h"
/****************************************************************************
Get a port number in host byte order from a sockaddr_storage.
diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c
index 1c95d0e99f..943cbcbe6d 100644
--- a/source3/libsmb/nmblib.c
+++ b/source3/libsmb/nmblib.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "../lib/util/select.h"
static const struct opcode_names {
const char *nmb_opcode_name;
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index 2dd218aece..5d5a67bf62 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "nmbd/nmbd.h"
+#include "../lib/util/select.h"
extern int ClientNMB;
extern int ClientDGRAM;
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 4db54f39c0..a484dfd3f2 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -24,6 +24,7 @@
#include "librpc/gen_ndr/messaging.h"
#include "../lib/async_req/async_sock.h"
#include "ctdbd_conn.h"
+#include "../lib/util/select.h"
extern bool global_machine_password_needs_changing;
diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index 65d846124b..9d3e46825f 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "../lib/util/select.h"
#define SECURITY_MASK 0
#define SECURITY_SET 0
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index a6cc64a7b5..a4d8b8ac41 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -32,6 +32,7 @@
#include "../../nsswitch/libwbclient/wbc_async.h"
#include "librpc/gen_ndr/messaging.h"
#include "secrets.h"
+#include "../lib/util/select.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/wscript_build b/source3/wscript_build
index ff091b5e8a..0d70a936ec 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -162,7 +162,8 @@ UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
../lib/util/become_daemon.c ../lib/util/system.c
../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c
../lib/util/smb_threads.c ../lib/util/util_id.c
- ../lib/util/blocking.c ../lib/util/rfc1738.c '''
+ ../lib/util/blocking.c ../lib/util/rfc1738.c
+ ../lib/util/select.c'''
LIBTEVENT_SRC0 = ''
@@ -194,7 +195,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
lib/util.c lib/util_names.c
lib/util_sock.c lib/sock_exec.c lib/util_sec.c
lib/substitute.c lib/dbwrap_util.c
- lib/ms_fnmatch.c lib/select.c lib/errmap_unix.c
+ lib/ms_fnmatch.c lib/errmap_unix.c
lib/tallocmsg.c lib/dmallocmsg.c
libsmb/clisigning.c libsmb/smb_signing.c
lib/iconv.c lib/pam_errors.c intl/lang_tdb.c
diff --git a/source4/lib/smbreadline/smbreadline.c b/source4/lib/smbreadline/smbreadline.c
index b07417357f..fa59e5d7d5 100644
--- a/source4/lib/smbreadline/smbreadline.c
+++ b/source4/lib/smbreadline/smbreadline.c
@@ -24,51 +24,6 @@
#include "system/readline.h"
#include "lib/smbreadline/smbreadline.h"
-/*******************************************************************
- Similar to sys_select() but catch EINTR and continue.
- This is what sys_select() used to do in Samba.
-********************************************************************/
-
-static int sys_select_intr(int maxfd, fd_set *readfds, fd_set *writefds, fd_set *errorfds, struct timeval *tval)
-{
- int ret;
- fd_set *readfds2, readfds_buf, *writefds2, writefds_buf, *errorfds2, errorfds_buf;
- struct timeval tval2, *ptval;
-
- readfds2 = (readfds ? &readfds_buf : NULL);
- writefds2 = (writefds ? &writefds_buf : NULL);
- errorfds2 = (errorfds ? &errorfds_buf : NULL);
- ptval = (tval ? &tval2 : NULL);
-
- do {
- if (readfds)
- readfds_buf = *readfds;
- if (writefds)
- writefds_buf = *writefds;
- if (errorfds)
- errorfds_buf = *errorfds;
- if (tval)
- tval2 = *tval;
-
- /* We must use select and not sys_select here. If we use
- sys_select we'd lose the fact a signal occurred when sys_select
- read a byte from the pipe. Fix from Mark Weaver
- <mark-clist@npsl.co.uk>
- */
-
- ret = select(maxfd, readfds2, writefds2, errorfds2, ptval);
- } while (ret == -1 && errno == EINTR);
-
- if (readfds)
- *readfds = readfds_buf;
- if (writefds)
- *writefds = writefds_buf;
- if (errorfds)
- *errorfds = errorfds_buf;
-
- return ret;
-}
-
/****************************************************************************
Display the prompt and wait for input. Call callback() regularly
****************************************************************************/
generated by cgit (git 2.34.1) at 2024-06-23 20:09:16 +0000