[src/trunk]: src/crypto/external/bsd/openssh/dist On reasonably modern versio...

[elric <elric%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ed4c6cab7a5e
branches:  trunk
changeset: 764300:ed4c6cab7a5e
user:      elric <elric%NetBSD.org@localhost>
date:      Fri Apr 15 14:51:22 2011 +0000

description:
On reasonably modern versions of Heimdal, you should not include krb5.h
to get the krb5 GSS functions.  gssapi/gssapi_krb5.h should be included.

[this is necesary for the next Heimdal upgrade as krb5.h inclusion is no
longer effective.]

diffstat:

 crypto/external/bsd/openssh/dist/gss-serv-krb5.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 8e80622d3dbe -r ed4c6cab7a5e crypto/external/bsd/openssh/dist/gss-serv-krb5.c
--- a/crypto/external/bsd/openssh/dist/gss-serv-krb5.c  Fri Apr 15 14:41:11 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/gss-serv-krb5.c  Fri Apr 15 14:51:22 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gss-serv-krb5.c,v 1.2 2009/06/07 22:38:46 christos Exp $       */
+/*     $NetBSD: gss-serv-krb5.c,v 1.3 2011/04/15 14:51:22 elric Exp $  */
 /* $OpenBSD: gss-serv-krb5.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: gss-serv-krb5.c,v 1.2 2009/06/07 22:38:46 christos Exp $");
+__RCSID("$NetBSD: gss-serv-krb5.c,v 1.3 2011/04/15 14:51:22 elric Exp $");
 #ifdef GSSAPI
 #ifdef KRB5
 
@@ -48,7 +48,7 @@
 extern ServerOptions options;
 
 #ifdef HEIMDAL
-# include <krb5.h>
+# include <gssapi/gssapi_krb5.h>
 #else
 # ifdef HAVE_GSSAPI_KRB5_H
 #  include <gssapi_krb5.h>