2 files changed, 16 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d08a80d3..85af46f84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 20080721
  - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2008/07/23 07:36:55
+     [servconf.c]
+     do not try to print options that have been compile-time disabled
+     in config test mode (sshd -T); report from nix-corp AT esperi.org.uk
+     ok dtucker@
+
+20080721
+ - (djm) OpenBSD CVS Sync
    - jmc@cvs.openbsd.org 2008/07/18 22:51:01
      [sftp-server.8]
      no need for .Pp before or after .Sh;
@@ -4710,4 +4718,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.5095 2008/07/21 08:22:25 djm Exp $
+$Id: ChangeLog,v 1.5096 2008/07/23 07:40:04 djm Exp $
diff --git a/servconf.c b/servconf.c
index 66e22979f..72746d34e 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.186 2008/07/04 03:44:59 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.187 2008/07/23 07:36:55 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1562,12 +1562,18 @@ dump_config(ServerOptions *o)
             o->hostbased_uses_name_from_packet_only);
         dump_cfg_fmtint(sRSAAuthentication, o->rsa_authentication);
         dump_cfg_fmtint(sPubkeyAuthentication, o->pubkey_authentication);
+#ifdef KRB5
         dump_cfg_fmtint(sKerberosAuthentication, o->kerberos_authentication);
         dump_cfg_fmtint(sKerberosOrLocalPasswd, o->kerberos_or_local_passwd);
         dump_cfg_fmtint(sKerberosTicketCleanup, o->kerberos_ticket_cleanup);
+# ifdef USE_AFS
         dump_cfg_fmtint(sKerberosGetAFSToken, o->kerberos_get_afs_token);
+# endif
+#endif
+#ifdef GSSAPI
         dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
         dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
+#endif
         dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
         dump_cfg_fmtint(sKbdInteractiveAuthentication,
             o->kbd_interactive_authentication);