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) |
- 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 @@ | |||
29 | - markus@cvs.openbsd.org 2002/04/01 22:07:17 | 29 | - markus@cvs.openbsd.org 2002/04/01 22:07:17 |
30 | [sftp-client.c] | 30 | [sftp-client.c] |
31 | fallback to stat if server does not support lstat | 31 | fallback to stat if server does not support lstat |
32 | - markus@cvs.openbsd.org 2002/04/02 11:49:39 | ||
33 | [ssh-agent.c] | ||
34 | check $SHELL for -k and -d, too; | ||
35 | http://bugzilla.mindrot.org/show_bug.cgi?id=199 | ||
32 | 36 | ||
33 | 20020401 | 37 | 20020401 |
34 | - (stevesk) [monitor.c] PAM should work again; will *not* work with | 38 | - (stevesk) [monitor.c] PAM should work again; will *not* work with |
@@ -8136,4 +8140,4 @@ | |||
8136 | - Wrote replacements for strlcpy and mkdtemp | 8140 | - Wrote replacements for strlcpy and mkdtemp |
8137 | - Released 1.0pre1 | 8141 | - Released 1.0pre1 |
8138 | 8142 | ||
8139 | $Id: ChangeLog,v 1.2016 2002/04/02 21:00:31 mouring Exp $ | 8143 | $Id: ChangeLog,v 1.2017 2002/04/02 21:03:51 mouring Exp $ |
diff --git a/ssh-agent.c b/ssh-agent.c index f8183b400..ccce33c3c 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -34,7 +34,7 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "includes.h" | 36 | #include "includes.h" |
37 | RCSID("$OpenBSD: ssh-agent.c,v 1.84 2002/03/25 17:34:27 markus Exp $"); | 37 | RCSID("$OpenBSD: ssh-agent.c,v 1.85 2002/04/02 11:49:39 markus Exp $"); |
38 | 38 | ||
39 | #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) | 39 | #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) |
40 | #include <sys/queue.h> | 40 | #include <sys/queue.h> |
@@ -867,7 +867,7 @@ main(int ac, char **av) | |||
867 | if (ac > 0 && (c_flag || k_flag || s_flag || d_flag)) | 867 | if (ac > 0 && (c_flag || k_flag || s_flag || d_flag)) |
868 | usage(); | 868 | usage(); |
869 | 869 | ||
870 | if (ac == 0 && !c_flag && !k_flag && !s_flag && !d_flag) { | 870 | if (ac == 0 && !c_flag && !s_flag) { |
871 | shell = getenv("SHELL"); | 871 | shell = getenv("SHELL"); |
872 | if (shell != NULL && strncmp(shell + strlen(shell) - 3, "csh", 3) == 0) | 872 | if (shell != NULL && strncmp(shell + strlen(shell) - 3, "csh", 3) == 0) |
873 | c_flag = 1; | 873 | c_flag = 1; |