summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-07-14 12:12:55 +1000
committerDamien Miller <djm@mindrot.org>2001-07-14 12:12:55 +1000
commit48bfa9cafaff0a8f615cb16449f9a3a2fdc39d67 (patch)
tree2a451c755b9841ac926305ead8e2af52cd4ff03e
parent98273e3adeac9aba6851bd74a662a3735fc2448b (diff)
- OpenBSD CVS Sync
- markus@cvs.openbsd.org 2001/07/04 22:47:19 [ssh-agent.c] ignore SIGPIPE when debugging, too
-rw-r--r--ChangeLog6
-rw-r--r--ssh-agent.c9
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 965af4249..374be9208 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
3 pam_nologin module. Report from William Yodlowsky 3 pam_nologin module. Report from William Yodlowsky
4 <bsd@openbsd.rutgers.edu> 4 <bsd@openbsd.rutgers.edu>
5 - (djm) Revert dirname fix, a better one is on its way. 5 - (djm) Revert dirname fix, a better one is on its way.
6 - OpenBSD CVS Sync
7 - markus@cvs.openbsd.org 2001/07/04 22:47:19
8 [ssh-agent.c]
9 ignore SIGPIPE when debugging, too
6 10
720010711 1120010711
8 - (djm) dirname(3) may modify its argument on glibc and other systems. 12 - (djm) dirname(3) may modify its argument on glibc and other systems.
@@ -5978,4 +5982,4 @@
5978 - Wrote replacements for strlcpy and mkdtemp 5982 - Wrote replacements for strlcpy and mkdtemp
5979 - Released 1.0pre1 5983 - Released 1.0pre1
5980 5984
5981$Id: ChangeLog,v 1.1386 2001/07/14 01:55:15 djm Exp $ 5985$Id: ChangeLog,v 1.1387 2001/07/14 02:12:55 djm Exp $
diff --git a/ssh-agent.c b/ssh-agent.c
index 309b9d414..392d1a0cd 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.60 2001/06/27 05:42:25 markus Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.61 2001/07/04 22:47:19 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,7 +36,7 @@
36 */ 36 */
37 37
38#include "includes.h" 38#include "includes.h"
39RCSID("$OpenBSD: ssh-agent.c,v 1.60 2001/06/27 05:42:25 markus Exp $"); 39RCSID("$OpenBSD: ssh-agent.c,v 1.61 2001/07/04 22:47:19 markus Exp $");
40 40
41#include <openssl/evp.h> 41#include <openssl/evp.h>
42#include <openssl/md5.h> 42#include <openssl/md5.h>
@@ -1008,10 +1008,9 @@ skip:
1008 alarm(10); 1008 alarm(10);
1009 } 1009 }
1010 idtab_init(); 1010 idtab_init();
1011 if (!d_flag) { 1011 if (!d_flag)
1012 signal(SIGINT, SIG_IGN); 1012 signal(SIGINT, SIG_IGN);
1013 signal(SIGPIPE, SIG_IGN); 1013 signal(SIGPIPE, SIG_IGN);
1014 }
1015 signal(SIGHUP, cleanup_handler); 1014 signal(SIGHUP, cleanup_handler);
1016 signal(SIGTERM, cleanup_handler); 1015 signal(SIGTERM, cleanup_handler);
1017 while (1) { 1016 while (1) {