summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-04 11:10:01 +1100
committerDamien Miller <djm@mindrot.org>2014-02-04 11:10:01 +1100
commitb0f26544cf6f4feeb1a4f6db09fca834f5c9867d (patch)
tree383eeaf91261c755574cda973cf6def4b5531e1a
parentf8f35bc471500348bb262039fb1fc43175d251b0 (diff)
- djm@cvs.openbsd.org 2014/01/29 00:19:26
[sshd.c] use kill(0, ...) instead of killpg(0, ...); on most operating systems they are equivalent, but SUSv2 describes the latter as having undefined behaviour; from portable; ok dtucker (Id sync only; change is already in portable)
-rw-r--r--ChangeLog6
-rw-r--r--sshd.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6eb3c93e1..7a4db10a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,12 @@
14 [ssh-keyscan.1] 14 [ssh-keyscan.1]
15 kill some bad Pa; 15 kill some bad Pa;
16 From: Jan Stary 16 From: Jan Stary
17 - djm@cvs.openbsd.org 2014/01/29 00:19:26
18 [sshd.c]
19 use kill(0, ...) instead of killpg(0, ...); on most operating systems
20 they are equivalent, but SUSv2 describes the latter as having undefined
21 behaviour; from portable; ok dtucker
22 (Id sync only; change is already in portable)
17 23
1820140131 2420140131
19 - (djm) [sandbox-seccomp-filter.c sandbox-systrace.c] Allow shutdown(2) 25 - (djm) [sandbox-seccomp-filter.c sandbox-systrace.c] Allow shutdown(2)
diff --git a/sshd.c b/sshd.c
index 25583576d..cb2e7db40 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.415 2014/01/27 19:18:54 markus Exp $ */ 1/* $OpenBSD: sshd.c,v 1.416 2014/01/29 00:19:26 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland