diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:39:36 +0000 |
commit | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (patch) | |
tree | d12ff16d94cffc5d84dba0193eaaa616967c9c2c /ssh-agent.c | |
parent | cadac134eda6ed97478afdc528a68dd33f31dbc5 (diff) | |
parent | 1e4cfeee6c17b02af09418c5afe4a4d71aaaf0c8 (diff) |
import openssh-5.3p1-gsskex-all-20100124.patch
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 9123cfe6b..f77dea3a6 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.159 2008/06/28 14:05:15 djm Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.161 2009/03/23 19:38:04 tobias 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 |
@@ -1061,6 +1061,7 @@ main(int ac, char **av) | |||
1061 | pid_t pid; | 1061 | pid_t pid; |
1062 | char pidstrbuf[1 + 3 * sizeof pid]; | 1062 | char pidstrbuf[1 + 3 * sizeof pid]; |
1063 | struct timeval *tvp = NULL; | 1063 | struct timeval *tvp = NULL; |
1064 | size_t len; | ||
1064 | 1065 | ||
1065 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ | 1066 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
1066 | sanitise_stdfd(); | 1067 | sanitise_stdfd(); |
@@ -1121,8 +1122,8 @@ main(int ac, char **av) | |||
1121 | 1122 | ||
1122 | if (ac == 0 && !c_flag && !s_flag) { | 1123 | if (ac == 0 && !c_flag && !s_flag) { |
1123 | shell = getenv("SHELL"); | 1124 | shell = getenv("SHELL"); |
1124 | if (shell != NULL && | 1125 | if (shell != NULL && (len = strlen(shell)) > 2 && |
1125 | strncmp(shell + strlen(shell) - 3, "csh", 3) == 0) | 1126 | strncmp(shell + len - 3, "csh", 3) == 0) |
1126 | c_flag = 1; | 1127 | c_flag = 1; |
1127 | } | 1128 | } |
1128 | if (k_flag) { | 1129 | if (k_flag) { |