summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-01-28 15:08:12 +1100
committerDamien Miller <djm@mindrot.org>2014-01-28 15:08:12 +1100
commitab16ef4152914d44ce6f76e48167d26d22f66a06 (patch)
tree2d118113334435406060196b509b9ccf1b6d398a
parentab0394905884dc6e58c3721211c6b38fb8fc2ca8 (diff)
- (djm) [sshd.c] Use kill(0, ...) instead of killpg(0, ...); the
latter being specified to have undefined behaviour in SUSv3; ok dtucker
-rw-r--r--ChangeLog3
-rw-r--r--sshd.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a2be7f8be..549db120b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
120140128 120140128
2 - (djm) [configure.ac] Search for inet_ntop in libnsl and libresovl; 2 - (djm) [configure.ac] Search for inet_ntop in libnsl and libresovl;
3 ok dtucker 3 ok dtucker
4 - (djm) [sshd.c] Use kill(0, ...) instead of killpg(0, ...); the
5 latter being specified to have undefined behaviour in SUSv3;
6 ok dtucker
4 7
520140127 820140127
6 - (dtucker) [Makefile.in] Remove trailing backslash which some make 9 - (dtucker) [Makefile.in] Remove trailing backslash which some make
diff --git a/sshd.c b/sshd.c
index a5d4218b3..25380c911 100644
--- a/sshd.c
+++ b/sshd.c
@@ -372,7 +372,7 @@ grace_alarm_handler(int sig)
372 */ 372 */
373 if (getpgid(0) == getpid()) { 373 if (getpgid(0) == getpid()) {
374 signal(SIGTERM, SIG_IGN); 374 signal(SIGTERM, SIG_IGN);
375 killpg(0, SIGTERM); 375 kill(0, SIGTERM);
376 } 376 }
377 377
378 /* Log error and exit. */ 378 /* Log error and exit. */