|
Lines 1-110
Link Here
|
| 1 |
Index: nsd.8 |
|
|
| 2 |
=================================================================== |
| 3 |
RCS file: /cvs/nsd/nsd.8,v |
| 4 |
retrieving revision 1.28 |
| 5 |
retrieving revision 1.28.2.1 |
| 6 |
diff -u -r1.28 -r1.28.2.1 |
| 7 |
--- nsd.8 22 Apr 2004 13:23:05 -0000 1.28 |
| 8 |
+++ nsd.8 21 Jul 2004 16:31:50 -0000 1.28.2.1 |
| 9 |
@@ -158,7 +158,7 @@ |
| 10 |
.Ar seconds |
| 11 |
seconds. |
| 12 |
This is equal to sending |
| 13 |
-.Em SIGILL |
| 14 |
+.Em SIGUSR1 |
| 15 |
to the daemon periodically. |
| 16 |
|
| 17 |
.It Fl t Ar chroot |
| 18 |
@@ -208,7 +208,7 @@ |
| 19 |
Stop answering queries, shutdown, and exit normally. |
| 20 |
.It Dv SIGHUP |
| 21 |
Reload the database. |
| 22 |
-.It Dv SIGILL |
| 23 |
+.It Dv SIGUSR1 |
| 24 |
Dump BIND8-style statistics into the log. Ignored otherwise. |
| 25 |
.El |
| 26 |
.\" .Sh IMPLEMENTATION NOTES |
| 27 |
Index: nsd.c |
| 28 |
=================================================================== |
| 29 |
RCS file: /cvs/nsd/nsd.c,v |
| 30 |
retrieving revision 1.105 |
| 31 |
retrieving revision 1.105.2.1 |
| 32 |
diff -u -r1.105 -r1.105.2.1 |
| 33 |
--- nsd.c 22 Apr 2004 13:23:06 -0000 1.105 |
| 34 |
+++ nsd.c 21 Jul 2004 16:31:54 -0000 1.105.2.1 |
| 35 |
@@ -218,6 +218,7 @@ |
| 36 |
nsd.mode = NSD_QUIT; |
| 37 |
break; |
| 38 |
case SIGILL: |
| 39 |
+ case SIGUSR1: /* Dump stats on SIGUSR1. */ |
| 40 |
nsd.mode = NSD_STATS; |
| 41 |
break; |
| 42 |
default: |
| 43 |
@@ -237,8 +238,17 @@ |
| 44 |
#ifdef BIND8_STATS |
| 45 |
alarm(nsd.st.period); |
| 46 |
#endif |
| 47 |
- sig = SIGILL; |
| 48 |
+ sig = SIGUSR1; |
| 49 |
+ break; |
| 50 |
case SIGILL: |
| 51 |
+ /* |
| 52 |
+ * For backwards compatibility with BIND 8 and older |
| 53 |
+ * versions of NSD. |
| 54 |
+ */ |
| 55 |
+ sig = SIGUSR1; |
| 56 |
+ break; |
| 57 |
+ case SIGUSR1: |
| 58 |
+ /* Dump statistics. */ |
| 59 |
break; |
| 60 |
case SIGINT: |
| 61 |
/* Silent shutdown... */ |
| 62 |
@@ -248,6 +258,7 @@ |
| 63 |
default: |
| 64 |
nsd.mode = NSD_SHUTDOWN; |
| 65 |
log_msg(LOG_WARNING, "signal %d received, shutting down...", sig); |
| 66 |
+ sig = SIGTERM; |
| 67 |
break; |
| 68 |
} |
| 69 |
|
| 70 |
@@ -724,6 +735,7 @@ |
| 71 |
sigaction(SIGHUP, &action, NULL); |
| 72 |
sigaction(SIGINT, &action, NULL); |
| 73 |
sigaction(SIGILL, &action, NULL); |
| 74 |
+ sigaction(SIGUSR1, &action, NULL); |
| 75 |
sigaction(SIGALRM, &action, NULL); |
| 76 |
sigaction(SIGCHLD, &action, NULL); |
| 77 |
action.sa_handler = SIG_IGN; |
| 78 |
Index: nsdc.sh.in |
| 79 |
=================================================================== |
| 80 |
RCS file: /cvs/nsd/nsdc.sh.in,v |
| 81 |
retrieving revision 1.30 |
| 82 |
retrieving revision 1.30.2.1 |
| 83 |
diff -u -r1.30 -r1.30.2.1 |
| 84 |
--- nsdc.sh.in 22 Apr 2004 13:39:47 -0000 1.30 |
| 85 |
+++ nsdc.sh.in 21 Jul 2004 16:31:56 -0000 1.30.2.1 |
| 86 |
@@ -89,7 +89,7 @@ |
| 87 |
signal "TERM" |
| 88 |
;; |
| 89 |
stats) |
| 90 |
- signal "ILL" |
| 91 |
+ signal "USR1" |
| 92 |
;; |
| 93 |
reload) |
| 94 |
signal "HUP" |
| 95 |
Index: server.c |
| 96 |
=================================================================== |
| 97 |
RCS file: /cvs/nsd/server.c,v |
| 98 |
retrieving revision 1.123 |
| 99 |
retrieving revision 1.123.2.1 |
| 100 |
diff -u -r1.123 -r1.123.2.1 |
| 101 |
--- server.c 12 May 2004 14:45:35 -0000 1.123 |
| 102 |
+++ server.c 21 Jul 2004 16:32:00 -0000 1.123.2.1 |
| 103 |
@@ -623,6 +623,7 @@ |
| 104 |
sigemptyset(&block_sigmask); |
| 105 |
sigaddset(&block_sigmask, SIGHUP); |
| 106 |
sigaddset(&block_sigmask, SIGILL); |
| 107 |
+ sigaddset(&block_sigmask, SIGUSR1); |
| 108 |
sigaddset(&block_sigmask, SIGINT); |
| 109 |
sigaddset(&block_sigmask, SIGTERM); |
| 110 |
sigprocmask(SIG_BLOCK, &block_sigmask, &default_sigmask); |