diff options
| author | des <des@FreeBSD.org> | 2009-10-01 15:19:37 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2009-10-01 15:19:37 +0000 |
| commit | 98b8242e22b0fc941b830dcec63d235b01bd46a2 (patch) | |
| tree | e5b7ad86bb53b8a7e0394f159b15abac2622bdb6 /ssh-agent.c | |
| parent | f4c3a2131f559534b5693fd15df8d89049db7cbb (diff) | |
| download | FreeBSD-src-98b8242e22b0fc941b830dcec63d235b01bd46a2.zip FreeBSD-src-98b8242e22b0fc941b830dcec63d235b01bd46a2.tar.gz | |
Vendor import of OpenSSH 5.3p1
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 9123cfe..f77dea3 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.159 2008/06/28 14:05:15 djm Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.161 2009/03/23 19:38:04 tobias Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1061,6 +1061,7 @@ main(int ac, char **av) pid_t pid; char pidstrbuf[1 + 3 * sizeof pid]; struct timeval *tvp = NULL; + size_t len; /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ sanitise_stdfd(); @@ -1121,8 +1122,8 @@ main(int ac, char **av) if (ac == 0 && !c_flag && !s_flag) { shell = getenv("SHELL"); - if (shell != NULL && - strncmp(shell + strlen(shell) - 3, "csh", 3) == 0) + if (shell != NULL && (len = strlen(shell)) > 2 && + strncmp(shell + len - 3, "csh", 3) == 0) c_flag = 1; } if (k_flag) { |
