summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker <dtucker>2013-06-02 13:47:11 +0000
committerdtucker <dtucker>2013-06-02 13:47:11 +0000
commit0455253e571c3485061dd05f2cbd94ed22bed175 (patch)
tree980d1183bf3bab42f15f040642472750d8a13258
parentac9f301d3c9977479da3076d0962770ce450fd5d (diff)
downloadopenssh-0455253e571c3485061dd05f2cbd94ed22bed175.tar.gz
- dtucker@cvs.openbsd.org 2013/06/02 13:35:58
[ssh-agent.c] Make parent_alive_interval time_t to avoid signed/unsigned comparison
-rw-r--r--ChangeLog3
-rw-r--r--ssh-agent.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a66555b..03a2e3ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
- dtucker@cvs.openbsd.org 2013/06/02 13:33:05
[progressmeter.c]
Add misc.h for monotime prototype. (ID sync only).
+ - dtucker@cvs.openbsd.org 2013/06/02 13:35:58
+ [ssh-agent.c]
+ Make parent_alive_interval time_t to avoid signed/unsigned comparison
20130601
- (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to
diff --git a/ssh-agent.c b/ssh-agent.c
index f5e5873a..27df4f47 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.175 2013/06/01 13:15:52 dtucker Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.176 2013/06/02 13:35:58 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -122,7 +122,7 @@ int max_fd = 0;
/* pid of shell == parent of agent */
pid_t parent_pid = -1;
-u_int parent_alive_interval = 0;
+time_t parent_alive_interval = 0;
/* pathname and directory for AUTH_SOCKET */
char socket_name[MAXPATHLEN];