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.]
This commit is contained in:
elric 2011-04-15 14:51:22 +00:00
parent d8282bb7a4
commit f8f7efe31c
1 changed files with 3 additions and 3 deletions

View File

@ -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 $ */ /* $OpenBSD: gss-serv-krb5.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */
/* /*
@ -26,7 +26,7 @@
*/ */
#include "includes.h" #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 GSSAPI
#ifdef KRB5 #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; extern ServerOptions options;
#ifdef HEIMDAL #ifdef HEIMDAL
# include <krb5.h> # include <gssapi/gssapi_krb5.h>
#else #else
# ifdef HAVE_GSSAPI_KRB5_H # ifdef HAVE_GSSAPI_KRB5_H
# include <gssapi_krb5.h> # include <gssapi_krb5.h>