3 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f31d44bcd..830c39487 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
      [ssh.1 ssh.c ssh_config.5 sshd_config.5]
      more details and clarity for tun(4) device forwarding; ok and help
      jmc@
+   - stevesk@cvs.openbsd.org 2006/07/02 18:36:47
+     [gss-serv-krb5.c gss-serv.c]
+     no "servconf.h" needed here
+     (gss-serv-krb5.c change not applied, portable needs the server options)
 
 20060706
  - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4745,4 +4749,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4362 2006/07/10 10:16:27 djm Exp $
+$Id: ChangeLog,v 1.4363 2006/07/10 10:17:55 djm Exp $
diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
index 9b1792a62..eae29b2ae 100644
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gss-serv-krb5.c,v 1.5 2006/03/25 22:22:43 djm Exp $ */
+/* $OpenBSD: gss-serv-krb5.c,v 1.6 2006/07/02 18:36:47 stevesk Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
diff --git a/gss-serv.c b/gss-serv.c
index 5e43ffe58..4ce536d99 100644
--- a/gss-serv.c
+++ b/gss-serv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gss-serv.c,v 1.17 2006/03/30 09:58:15 djm Exp $ */
+/* $OpenBSD: gss-serv.c,v 1.18 2006/07/02 18:36:47 stevesk Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -33,7 +33,6 @@
 #include "log.h"
 #include "channels.h"
 #include "session.h"
-#include "servconf.h"
 #include "xmalloc.h"
 #include "misc.h"