summaryrefslogtreecommitdiff
path: root/ssh-agent.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-01-24 22:46:54 +0000
committerColin Watson <cjwatson@debian.org>2010-01-24 22:46:54 +0000
commit59247ecde39f2d826a94ab07f6095ca1f6644e88 (patch)
tree5910d4a840352aafbf67e8a39fa63936e5529b26 /ssh-agent.c
parent07d905b406c4ab64ea2f10a22f4f8f0d595269f6 (diff)
parent964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff)
* New upstream release.
* Update to GSSAPI patch from http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.
Diffstat (limited to 'ssh-agent.c')
-rw-r--r--ssh-agent.c7
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) {