From: mouring <mouring>
Date: Tue, 2 Apr 2002 21:03:51 +0000 (+0000)
Subject:    - markus@cvs.openbsd.org 2002/04/02 11:49:39
X-Git-Tag: PRE_SW_KRBV~36
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/b745a2f2ccecd64ce4ecb1ad57c41d0f995926fd

   - 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 e4d01d77..b8579c2e 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
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;