Module Name: src
Committed By: elric
Date: Fri Apr 15 14:51:22 UTC 2011
Modified Files:
src/crypto/external/bsd/openssh/dist: gss-serv-krb5.c
Log Message:
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.]
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c
diff -u src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c:1.2 src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c:1.3
--- src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c:1.2 Sun Jun 7 22:38:46 2009
+++ src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c Fri Apr 15 14:51:22 2011
@@ -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>
