2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f37b7e5fd..7aa8a9f38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
      [channels.c]
      don't assume that the socks4 username is \0 terminated;
      spotted by Ben Hawkes; ok markus@
+   - markus@cvs.openbsd.org 2014/02/26 21:53:37
+     [sshd.c]
+     ssh_gssapi_prepare_supported_oids needs GSSAPI
 
 20140224
  - OpenBSD CVS Sync
diff --git a/sshd.c b/sshd.c
index 51d7078e4..7523de977 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.419 2014/02/26 20:28:44 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.420 2014/02/26 21:53:37 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -618,9 +618,11 @@ privsep_preauth_child(void)
         /* Enable challenge-response authentication for privilege separation */
         privsep_challenge_enable();
 
+#ifdef GSSAPI
         /* Cache supported mechanism OIDs for later use */
         if (options.gss_authentication)
                 ssh_gssapi_prepare_supported_oids();
+#endif
 
         arc4random_stir();
         arc4random_buf(rnd, sizeof(rnd));