2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a167dfea1..91eb0ef70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,11 @@
      [session.c ssh.1]
      typo fixed (overriden -> overridden)
      ok espie, jmc
+   - stevesk@cvs.openbsd.org 2008/11/11 02:58:09
+     [servconf.c]
+     USE_AFS not referenced so remove #ifdef.  fixes sshd -T not printing
+     kerberosgetafstoken. ok dtucker@
+     (Id sync only, we still want the ifdef in portable)
 
 20081105
  - OpenBSD CVS Sync
@@ -4909,4 +4914,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5137 2008/11/11 05:33:48 dtucker Exp $
+$Id: ChangeLog,v 1.5138 2008/11/11 05:39:44 dtucker Exp $
diff --git a/servconf.c b/servconf.c
index 053e20a78..659a1eb21 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.191 2008/11/05 11:22:54 jmc Exp $ */
+/* $OpenBSD: servconf.c,v 1.192 2008/11/11 02:58:09 stevesk Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved