From f8f7efe31c658200e7cac43d756020a8530b7d65 Mon Sep 17 00:00:00 2001 From: elric Date: Fri, 15 Apr 2011 14:51:22 +0000 Subject: [PATCH] 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.] --- crypto/external/bsd/openssh/dist/gss-serv-krb5.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/external/bsd/openssh/dist/gss-serv-krb5.c b/crypto/external/bsd/openssh/dist/gss-serv-krb5.c index 69f5fc5056c5..af28c0361bf1 100644 --- a/crypto/external/bsd/openssh/dist/gss-serv-krb5.c +++ b/crypto/external/bsd/openssh/dist/gss-serv-krb5.c @@ -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 @@ __RCSID("$NetBSD: gss-serv-krb5.c,v 1.2 2009/06/07 22:38:46 christos Exp $"); extern ServerOptions options; #ifdef HEIMDAL -# include +# include #else # ifdef HAVE_GSSAPI_KRB5_H # include