diff --git a/ChangeLog b/ChangeLog index 9d01a1c4a..e10a3c425 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,9 @@ - markus@cvs.openbsd.org 2003/08/22 13:22:27 [auth2.c] (auth2-krb5.c removed) nuke "kerberos-2@ssh.com" + - markus@cvs.openbsd.org 2003/08/22 20:55:06 + [LICENCE] + add Simon Wilkinson - (dtucker) [Makefile.in acconfig.h auth-krb5.c auth-pam.c auth-pam.h configure.ac defines.h gss-serv-krb5.c session.c ssh-gss.h sshconnect1.c sshconnect2.c] Add Portable GSSAPI support, patch by Simon Wilkinson. @@ -891,4 +894,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2910 2003/08/26 02:08:15 dtucker Exp $ +$Id: ChangeLog,v 1.2911 2003/08/26 02:09:53 dtucker Exp $ diff --git a/LICENCE b/LICENCE index fac74c6ef..b47556dda 100644 --- a/LICENCE +++ b/LICENCE @@ -181,6 +181,7 @@ OpenSSH contains no GPL code. Wesley Griffin Per Allansson Nils Nordman + Simon Wilkinson Portable OpenSSH additionally includes code from the following copyright holders, also under the 2-term BSD license: @@ -328,4 +329,4 @@ OpenSSH contains no GPL code. ------ -$OpenBSD: LICENCE,v 1.16 2003/07/29 18:24:00 markus Exp $ +$OpenBSD: LICENCE,v 1.17 2003/08/22 20:55:06 markus Exp $