tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Ben Lindstrom 2000-12-22 20:27:43 +00:00
parent 46c162204b
commit 3deda8b091
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
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
20001222 20001222
- Updated RCSID for pty.c - Updated RCSID for pty.c
- (bal) OpenBSD CVS Updates: - (bal) OpenBSD CVS Updates:

5
Makefile.in
View File

@ -11,9 +11,7 @@ srcdir=@srcdir@
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
DESTDIR= DESTDIR=
VPATH=@srcdir@ VPATH=@srcdir@
SSH_PROGRAM=@bindir@/ssh SSH_PROGRAM=@bindir@/ssh
ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
@ -72,7 +70,8 @@ all: $(TARGETS) $(CONFIGFILES)
manpages: $(MANPAGES) manpages: $(MANPAGES)
$(LIBSSH_OBJS): config.h $(LIBSSH_OBJS): config.h
$(SSHOBJS): config.h
$(SSHDOBJS): config.h
$(LIBOPENBSD_COMPAT_OBJS): config.h $(LIBOPENBSD_COMPAT_OBJS): config.h
libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS) libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS)

6
ssh-keygen.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keygen.c,v 1.36 2000/12/19 23:17:58 markus Exp $"); RCSID("$OpenBSD: ssh-keygen.c,v 1.37 2000/12/22 16:49:40 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -101,8 +101,8 @@ ask_filename(struct passwd *pw, const char *prompt)
break; break;
} }
snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name); snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name);
printf("%s (%s): ", prompt, identity_file); fprintf(stderr, "%s (%s): ", prompt, identity_file);
fflush(stdout); fflush(stderr);
if (fgets(buf, sizeof(buf), stdin) == NULL) if (fgets(buf, sizeof(buf), stdin) == NULL)
exit(1); exit(1);
if (strchr(buf, '\n')) if (strchr(buf, '\n'))