summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-23 10:15:00 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-27 15:28:09 +0100
commit2630d4a2523894386f4e1a37cfb3a312f4e8fdf5 (patch)
tree7c8f1d33d5de1a518ee2a1f6114840b4b8c00534 /source3
parente663df195c2a6c108e90273b8fa9831abdbc3b1c (diff)
downloadsamba-2630d4a2523894386f4e1a37cfb3a312f4e8fdf5.tar.gz
samba-2630d4a2523894386f4e1a37cfb3a312f4e8fdf5.tar.bz2
samba-2630d4a2523894386f4e1a37cfb3a312f4e8fdf5.zip
s3:nmbd: as the sig_term() handler only sets a flag we don't need to block SIGTERM
The arguments of commit d98bea900ee694cdba83149620c65bd7f8765f26 are no longer valid. metze
Diffstat (limited to 'source3')
-rw-r--r--source3/nmbd/asyncdns.c12
-rw-r--r--source3/nmbd/nmbd.c3
-rw-r--r--source3/nmbd/nmbd_packets.c8
3 files changed, 0 insertions, 23 deletions
diff --git a/source3/nmbd/asyncdns.c b/source3/nmbd/asyncdns.c
index baa88bc44b..0736a66fb8 100644
--- a/source3/nmbd/asyncdns.c
+++ b/source3/nmbd/asyncdns.c
@@ -210,9 +210,6 @@ void run_dns_queue(void)
if (fd_in == -1)
return;
- /* Allow SIGTERM to kill us. */
- BlockSignals(False, SIGTERM);
-
if (!process_exists_by_pid(child_pid)) {
close(fd_in);
close(fd_out);
@@ -224,12 +221,9 @@ void run_dns_queue(void)
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("read from child failed: %s\n", nt_errstr(status)));
fd_in = -1;
- BlockSignals(True, SIGTERM);
return;
}
- BlockSignals(True, SIGTERM);
-
namerec = add_dns_result(&r.name, r.result);
if (dns_current) {
@@ -338,14 +332,8 @@ bool queue_dns_query(struct packet_struct *p,struct nmb_name *question)
DEBUG(3,("DNS search for %s - ", nmb_namestr(question)));
- /* Unblock TERM signal so we can be killed in DNS lookup. */
- BlockSignals(False, SIGTERM);
-
dns_ip.s_addr = interpret_addr(qname);
- /* Re-block TERM signal. */
- BlockSignals(True, SIGTERM);
-
namerec = add_dns_result(question, dns_ip);
if(namerec == NULL) {
send_wins_name_query_response(NAM_ERR, p, NULL);
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 870b9a1f30..1b26c0a5ad 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -969,9 +969,6 @@ static bool open_sockets(bool isdaemon, int port)
exit(1);
}
- /* We can only take signals in the select. */
- BlockSignals( True, SIGTERM );
-
TALLOC_FREE(frame);
process();
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index 489034899e..f69845b346 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -1794,16 +1794,8 @@ bool listen_for_packets(bool run_election)
&r_fds, &w_fds, &timeout, &maxfd);
}
- /* Prepare for the select - allow certain signals. */
-
- BlockSignals(False, SIGTERM);
-
selrtn = sys_select(maxfd+1,&r_fds,&w_fds,NULL,&timeout);
- /* We can only take signals when we are in the select - block them again here. */
-
- BlockSignals(True, SIGTERM);
-
if (run_events(nmbd_event_context(), selrtn, &r_fds, &w_fds)) {
return False;
}