summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--LICENCE3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d01a1c4a..e10a3c425 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
16 - markus@cvs.openbsd.org 2003/08/22 13:22:27 16 - markus@cvs.openbsd.org 2003/08/22 13:22:27
17 [auth2.c] (auth2-krb5.c removed) 17 [auth2.c] (auth2-krb5.c removed)
18 nuke "kerberos-2@ssh.com" 18 nuke "kerberos-2@ssh.com"
19 - markus@cvs.openbsd.org 2003/08/22 20:55:06
20 [LICENCE]
21 add Simon Wilkinson
19 - (dtucker) [Makefile.in acconfig.h auth-krb5.c auth-pam.c auth-pam.h 22 - (dtucker) [Makefile.in acconfig.h auth-krb5.c auth-pam.c auth-pam.h
20 configure.ac defines.h gss-serv-krb5.c session.c ssh-gss.h sshconnect1.c 23 configure.ac defines.h gss-serv-krb5.c session.c ssh-gss.h sshconnect1.c
21 sshconnect2.c] Add Portable GSSAPI support, patch by Simon Wilkinson. 24 sshconnect2.c] Add Portable GSSAPI support, patch by Simon Wilkinson.
@@ -891,4 +894,4 @@
891 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 894 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
892 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 895 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
893 896
894$Id: ChangeLog,v 1.2910 2003/08/26 02:08:15 dtucker Exp $ 897$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.
181 Wesley Griffin 181 Wesley Griffin
182 Per Allansson 182 Per Allansson
183 Nils Nordman 183 Nils Nordman
184 Simon Wilkinson
184 185
185 Portable OpenSSH additionally includes code from the following copyright 186 Portable OpenSSH additionally includes code from the following copyright
186 holders, also under the 2-term BSD license: 187 holders, also under the 2-term BSD license:
@@ -328,4 +329,4 @@ OpenSSH contains no GPL code.
328 329
329 330
330------ 331------
331$OpenBSD: LICENCE,v 1.16 2003/07/29 18:24:00 markus Exp $ 332$OpenBSD: LICENCE,v 1.17 2003/08/22 20:55:06 markus Exp $