diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 20:27:43 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-12-22 20:27:43 +0000 |
commit | 3deda8b091e571f5577ae50b75b89a21caed6aee (patch) | |
tree | 663f4a4503e688f204a4963a20e83d1aa8918a2b | |
parent | 46c162204b5a6f7471525c2f75cb2c607c88b83f (diff) |
20001223
- (bal) Fixed Makefile.in to support recompile of all ssh and sshd objects
if a change to config.h has occurred. Suggested by Gert Doering
<gert@greenie.muc.de>
- (bal) OpenBSD CVS Update:
- markus@cvs.openbsd.org 2000/12/22 16:49:40
[ssh-keygen.c]
fix ssh-keygen -x -t type > file; from Roumen.Petrov@skalasoft.com
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | Makefile.in | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 6 |
3 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,12 @@ | |||
1 | 20001223 | ||
2 | - (bal) Fixed Makefile.in to support recompile of all ssh and sshd objects | ||
3 | if a change to config.h has occurred. Suggested by Gert Doering | ||
4 | <gert@greenie.muc.de> | ||
5 | - (bal) OpenBSD CVS Update: | ||
6 | - markus@cvs.openbsd.org 2000/12/22 16:49:40 | ||
7 | [ssh-keygen.c] | ||
8 | fix ssh-keygen -x -t type > file; from Roumen.Petrov@skalasoft.com | ||
9 | |||
1 | 20001222 | 10 | 20001222 |
2 | - Updated RCSID for pty.c | 11 | - Updated RCSID for pty.c |
3 | - (bal) OpenBSD CVS Updates: | 12 | - (bal) OpenBSD CVS Updates: |
diff --git a/Makefile.in b/Makefile.in index 1d8028418..117968cdc 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -11,9 +11,7 @@ srcdir=@srcdir@ | |||
11 | top_srcdir=@top_srcdir@ | 11 | top_srcdir=@top_srcdir@ |
12 | 12 | ||
13 | DESTDIR= | 13 | DESTDIR= |
14 | |||
15 | VPATH=@srcdir@ | 14 | VPATH=@srcdir@ |
16 | |||
17 | SSH_PROGRAM=@bindir@/ssh | 15 | SSH_PROGRAM=@bindir@/ssh |
18 | ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass | 16 | ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass |
19 | 17 | ||
@@ -72,7 +70,8 @@ all: $(TARGETS) $(CONFIGFILES) | |||
72 | manpages: $(MANPAGES) | 70 | manpages: $(MANPAGES) |
73 | 71 | ||
74 | $(LIBSSH_OBJS): config.h | 72 | $(LIBSSH_OBJS): config.h |
75 | 73 | $(SSHOBJS): config.h | |
74 | $(SSHDOBJS): config.h | ||
76 | $(LIBOPENBSD_COMPAT_OBJS): config.h | 75 | $(LIBOPENBSD_COMPAT_OBJS): config.h |
77 | 76 | ||
78 | libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS) | 77 | libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS) |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 533cf192e..057803351 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.36 2000/12/19 23:17:58 markus Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.37 2000/12/22 16:49:40 markus Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -101,8 +101,8 @@ ask_filename(struct passwd *pw, const char *prompt) | |||
101 | break; | 101 | break; |
102 | } | 102 | } |
103 | snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name); | 103 | snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name); |
104 | printf("%s (%s): ", prompt, identity_file); | 104 | fprintf(stderr, "%s (%s): ", prompt, identity_file); |
105 | fflush(stdout); | 105 | fflush(stderr); |
106 | if (fgets(buf, sizeof(buf), stdin) == NULL) | 106 | if (fgets(buf, sizeof(buf), stdin) == NULL) |
107 | exit(1); | 107 | exit(1); |
108 | if (strchr(buf, '\n')) | 108 | if (strchr(buf, '\n')) |