From a256c650acd9b4f5d4bbc515607c74c3f9f3995e Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 3 Sep 2003 12:11:30 +1000
Subject: [PATCH]    - markus@cvs.openbsd.org 2003/08/28 12:54:34      [auth.h]
      remove kerberos support from ssh1, since it has been replaced with
 GSSAPI;      but keep kerberos passwd auth for ssh1 and 2; ok djm, hin,
 henning, ...

---
 ChangeLog | 6 +++++-
 auth.h    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f91e452d5..c62cf5fea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
      [auth2.c monitor.c]
      fix passwd auth for 'username leaks via timing'; with djm@, original 
      patches from solar
+   - markus@cvs.openbsd.org 2003/08/28 12:54:34
+     [auth.h]
+     remove kerberos support from ssh1, since it has been replaced with GSSAPI;
+     but keep kerberos passwd auth for ssh1 and 2; ok djm, hin, henning, ...
 
 20030902
  - (djm) OpenBSD CVS Sync
@@ -976,4 +980,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.2938 2003/09/02 21:32:45 djm Exp $
+$Id: ChangeLog,v 1.2939 2003/09/03 02:11:30 djm Exp $
diff --git a/auth.h b/auth.h
index 130a27da7..beaacb8bc 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth.h,v 1.45 2003/08/26 09:58:43 markus Exp $	*/
+/*	$OpenBSD: auth.h,v 1.46 2003/08/28 12:54:34 markus Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.