diff options
| author | Gerald Carter <jerry@samba.org> | 2005-06-09 15:20:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:57:09 -0500 |
| commit | 129b461673ecd0ad4d16c0c99585dd5c067172df (patch) | |
| tree | 1a87e9c9f5e6f89c70488e3a8fa0efb8c7e8c83d /source3/smbd | |
| parent | d197ddd4c331d12c6b1d4d582a37c49768cba856 (diff) | |
| download | samba-129b461673ecd0ad4d16c0c99585dd5c067172df.tar.gz samba-129b461673ecd0ad4d16c0c99585dd5c067172df.tar.bz2 samba-129b461673ecd0ad4d16c0c99585dd5c067172df.zip | |
r7440: * merge registry server changes from trunk (so far) for more
printmig.exe work
* merge the sys_select_signal(char c) change from trunk
in order to keeo the winbind code in sync
(This used to be commit a112c5570a7f8ddddde1af0fa665f40a6067e8cf)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/notify_kernel.c | 2 | ||||
| -rw-r--r-- | source3/smbd/oplock_linux.c | 2 | ||||
| -rw-r--r-- | source3/smbd/server.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/notify_kernel.c b/source3/smbd/notify_kernel.c index 6d1f550241..02abe0b4b6 100644 --- a/source3/smbd/notify_kernel.c +++ b/source3/smbd/notify_kernel.c @@ -74,7 +74,7 @@ static void signal_handler(int sig, siginfo_t *info, void *unused) fd_pending_array[signals_received] = (SIG_ATOMIC_T)info->si_fd; signals_received++; } /* Else signal is lost. */ - sys_select_signal(); + sys_select_signal(RT_SIGNAL_NOTIFY); } /**************************************************************************** diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c index 6d1bc64ce1..78dc260939 100644 --- a/source3/smbd/oplock_linux.c +++ b/source3/smbd/oplock_linux.c @@ -72,7 +72,7 @@ static void signal_handler(int sig, siginfo_t *info, void *unused) fd_pending_array[signals_received] = (SIG_ATOMIC_T)info->si_fd; signals_received++; } /* Else signal is lost. */ - sys_select_signal(); + sys_select_signal(RT_SIGNAL_LEASE); } /**************************************************************************** diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 301534d750..01515a5726 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -66,7 +66,7 @@ static void smbd_set_server_fd(int fd) static void sig_term(void) { got_sig_term = 1; - sys_select_signal(); + sys_select_signal(SIGTERM); } /**************************************************************************** @@ -76,7 +76,7 @@ static void sig_term(void) static void sig_hup(int sig) { reload_after_sighup = 1; - sys_select_signal(); + sys_select_signal(SIGHUP); } /**************************************************************************** |