- 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
diff --git a/ChangeLog b/ChangeLog
index d14f04a..9b5759a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 f8183b4..ccce33c 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 @@
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;