summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ffb9c997c..8a606abc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,7 @@
32 - (dtucker) [Makefile.in acconfig.h auth-krb5.c auth-pam.c auth-pam.h 32 - (dtucker) [Makefile.in acconfig.h auth-krb5.c auth-pam.c auth-pam.h
33 configure.ac defines.h gss-serv-krb5.c session.c ssh-gss.h sshconnect1.c 33 configure.ac defines.h gss-serv-krb5.c session.c ssh-gss.h sshconnect1.c
34 sshconnect2.c] Add Portable GSSAPI support, patch by Simon Wilkinson. 34 sshconnect2.c] Add Portable GSSAPI support, patch by Simon Wilkinson.
35 - (dtucker) [Makefile.in] Remove auth2-krb5.
35 36
3620030825 3720030825
37 - (djm) Bug #621: Select OpenSC keys by usage attributes. Patch from 38 - (djm) Bug #621: Select OpenSC keys by usage attributes. Patch from
@@ -904,4 +905,4 @@
904 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 905 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
905 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 906 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
906 907
907$Id: ChangeLog,v 1.2914 2003/08/26 02:14:05 dtucker Exp $ 908$Id: ChangeLog,v 1.2915 2003/08/26 02:22:04 dtucker Exp $
diff --git a/Makefile.in b/Makefile.in
index eba34f341..0ae7e4454 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.241 2003/08/26 01:58:16 dtucker Exp $ 1# $Id: Makefile.in,v 1.242 2003/08/26 02:22:04 dtucker Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -81,7 +81,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \
81 auth2-none.o auth2-passwd.o auth2-pubkey.o \ 81 auth2-none.o auth2-passwd.o auth2-pubkey.o \
82 monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \ 82 monitor_mm.o monitor.o monitor_wrap.o monitor_fdpass.o \
83 kexdhs.o kexgexs.o \ 83 kexdhs.o kexgexs.o \
84 auth-krb5.o auth2-krb5.o \ 84 auth-krb5.o \
85 auth2-gss.o gss-serv.o gss-serv-krb5.o \ 85 auth2-gss.o gss-serv.o gss-serv-krb5.o \
86 loginrec.o auth-pam.o auth-sia.o md5crypt.o 86 loginrec.o auth-pam.o auth-sia.o md5crypt.o
87 87