summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-agent.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a66555b9..03a2e3ad2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
5 - dtucker@cvs.openbsd.org 2013/06/02 13:33:05 5 - dtucker@cvs.openbsd.org 2013/06/02 13:33:05
6 [progressmeter.c] 6 [progressmeter.c]
7 Add misc.h for monotime prototype. (ID sync only). 7 Add misc.h for monotime prototype. (ID sync only).
8 - dtucker@cvs.openbsd.org 2013/06/02 13:35:58
9 [ssh-agent.c]
10 Make parent_alive_interval time_t to avoid signed/unsigned comparison
8 11
920130601 1220130601
10 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to 13 - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
diff --git a/ssh-agent.c b/ssh-agent.c
index f5e5873ad..27df4f475 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.175 2013/06/01 13:15:52 dtucker Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.176 2013/06/02 13:35:58 dtucker 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
@@ -122,7 +122,7 @@ int max_fd = 0;
122 122
123/* pid of shell == parent of agent */ 123/* pid of shell == parent of agent */
124pid_t parent_pid = -1; 124pid_t parent_pid = -1;
125u_int parent_alive_interval = 0; 125time_t parent_alive_interval = 0;
126 126
127/* pathname and directory for AUTH_SOCKET */ 127/* pathname and directory for AUTH_SOCKET */
128char socket_name[MAXPATHLEN]; 128char socket_name[MAXPATHLEN];