summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-21 01:24:01 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-21 01:24:01 +0000
commit900464e45469cb3974442cd788ec744b2e11b299 (patch)
tree25b7c705da26a967aa56fd043f79f0d6a0d2a20e
parent47e1b40c08f1f29fc22a188577db5f2bd557d736 (diff)
downloadopenssh-git-900464e45469cb3974442cd788ec744b2e11b299.tar.gz
- (bal) Missed integrating ssh_config.5 and sshd_config.5
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in6
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index af38001f..97617a01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@
missed Per Allansson (auth2-chall.c)
- (bal) Cygwin special handling of empty passwords wrong. Patch by
vinschen@redhat.com
+ - (bal) Missed integrating ssh_config.5 and sshd_config.5
20020613
- (bal) typo of setgroup for cygwin. Patch by vinschen@redhat.com
@@ -984,4 +985,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2232 2002/06/21 01:19:12 mouring Exp $
+$Id: ChangeLog,v 1.2233 2002/06/21 01:24:01 mouring Exp $
diff --git a/Makefile.in b/Makefile.in
index b6ba3067..7e948d80 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.213 2002/06/07 14:37:00 mouring Exp $
+# $Id: Makefile.in,v 1.214 2002/06/21 01:24:02 mouring Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@@ -65,8 +65,8 @@ SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o sshtty.o readconf.o clie
SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth2-hostbased.o auth2-kbdint.o auth2-none.o auth2-passwd.o auth2-pubkey.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-krb5.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o auth-sia.o sshpty.o sshlogin.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o auth-skey.o auth-bsdauth.o monitor_mm.o monitor.o
-MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out
-MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8
+MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out
+MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5
MANTYPE = @MANTYPE@
CONFIGFILES=sshd_config.out ssh_config.out moduli.out