diff options
author | Darren Tucker <dtucker@zip.com.au> | 2007-12-02 23:22:52 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2007-12-02 23:22:52 +1100 |
commit | 06321f5d1d328649913a1ee468d59149974e708f (patch) | |
tree | 602da7b5ef874fe40567b814c86f75c64baf376d | |
parent | e143f062ba1ee0d38c583acd6a8fbc8e679f45a3 (diff) |
- deraadt@cvs.openbsd.org 2007/11/03 02:03:49
[ssh.c]
avoid errno trashing in signal handler; ok dtucker
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -38,6 +38,9 @@ | |||
38 | - dtucker@cvs.openbsd.org 2007/11/03 02:00:32 | 38 | - dtucker@cvs.openbsd.org 2007/11/03 02:00:32 |
39 | [ssh.c] | 39 | [ssh.c] |
40 | Use xstrdup/xfree when saving pwname and pwdir; ok deraadt@ | 40 | Use xstrdup/xfree when saving pwname and pwdir; ok deraadt@ |
41 | - deraadt@cvs.openbsd.org 2007/11/03 02:03:49 | ||
42 | [ssh.c] | ||
43 | avoid errno trashing in signal handler; ok dtucker | ||
41 | 44 | ||
42 | 20071030 | 45 | 20071030 |
43 | - (djm) OpenBSD CVS Sync | 46 | - (djm) OpenBSD CVS Sync |
@@ -3455,4 +3458,4 @@ | |||
3455 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3458 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3456 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3459 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3457 | 3460 | ||
3458 | $Id: ChangeLog,v 1.4805 2007/12/02 12:21:16 dtucker Exp $ | 3461 | $Id: ChangeLog,v 1.4806 2007/12/02 12:22:52 dtucker Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.307 2007/11/03 02:00:32 dtucker Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.308 2007/11/03 02:03:49 deraadt 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 |
@@ -1294,8 +1294,12 @@ control_client_sighandler(int signo) | |||
1294 | static void | 1294 | static void |
1295 | control_client_sigrelay(int signo) | 1295 | control_client_sigrelay(int signo) |
1296 | { | 1296 | { |
1297 | int save_errno = errno; | ||
1298 | |||
1297 | if (control_server_pid > 1) | 1299 | if (control_server_pid > 1) |
1298 | kill(control_server_pid, signo); | 1300 | kill(control_server_pid, signo); |
1301 | |||
1302 | errno = save_errno; | ||
1299 | } | 1303 | } |
1300 | 1304 | ||
1301 | static int | 1305 | static int |