diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-02 21:03:51 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-04-02 21:03:51 +0000 |
| commit | eecdf235310bd3088acc547607452b657dd09f5a (patch) | |
| tree | 948de5fd3ced877188287cad9f9c8a0fd220f269 | |
| parent | f26ff5b9d86e77596ee1c049c58b0aac394876f3 (diff) | |
| download | openssh-git-eecdf235310bd3088acc547607452b657dd09f5a.tar.gz | |
- markus@cvs.openbsd.org 2002/04/02 11:49:39
[ssh-agent.c]
check $SHELL for -k and -d, too;
http://bugzilla.mindrot.org/show_bug.cgi?id=199
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ssh-agent.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -29,6 +29,10 @@ - markus@cvs.openbsd.org 2002/04/01 22:07:17 [sftp-client.c] fallback to stat if server does not support lstat + - markus@cvs.openbsd.org 2002/04/02 11:49:39 + [ssh-agent.c] + check $SHELL for -k and -d, too; + http://bugzilla.mindrot.org/show_bug.cgi?id=199 20020401 - (stevesk) [monitor.c] PAM should work again; will *not* work with @@ -8136,4 +8140,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.2016 2002/04/02 21:00:31 mouring Exp $ +$Id: ChangeLog,v 1.2017 2002/04/02 21:03:51 mouring Exp $ diff --git a/ssh-agent.c b/ssh-agent.c index f8183b40..ccce33c3 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -34,7 +34,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-agent.c,v 1.84 2002/03/25 17:34:27 markus Exp $"); +RCSID("$OpenBSD: ssh-agent.c,v 1.85 2002/04/02 11:49:39 markus Exp $"); #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) #include <sys/queue.h> @@ -867,7 +867,7 @@ main(int ac, char **av) if (ac > 0 && (c_flag || k_flag || s_flag || d_flag)) usage(); - if (ac == 0 && !c_flag && !k_flag && !s_flag && !d_flag) { + if (ac == 0 && !c_flag && !s_flag) { shell = getenv("SHELL"); if (shell != NULL && strncmp(shell + strlen(shell) - 3, "csh", 3) == 0) c_flag = 1; |