[src/trunk]: src/crypto/external/bsd/openssh Stop using -I/usr/include/gssapi...

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

details:   https://anonhg.NetBSD.org/src/rev/3ec3f36901f2
branches:  trunk
changeset: 764456:3ec3f36901f2
user:      elric <elric%NetBSD.org@localhost>
date:      Sun Apr 24 14:09:39 2011 +0000

description:
Stop using -I/usr/include/gssapi and -I/usr/include/krb5.  We must in this
case find kafs.h as krb5/kafs.h.

diffstat:

 crypto/external/bsd/openssh/Makefile.inc   |  6 +++---
 crypto/external/bsd/openssh/dist/session.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r db93d96ce733 -r 3ec3f36901f2 crypto/external/bsd/openssh/Makefile.inc
--- a/crypto/external/bsd/openssh/Makefile.inc  Sun Apr 24 14:01:46 2011 +0000
+++ b/crypto/external/bsd/openssh/Makefile.inc  Sun Apr 24 14:09:39 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.2 2010/11/21 19:19:21 adam Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2011/04/24 14:09:39 elric Exp $
 
 WARNS?=        1       # XXX -Wshadow -Wcast-qual
 
@@ -23,8 +23,8 @@
 .endif # USE_PAM == no
 
 .if (${USE_KERBEROS} != "no")
-CPPFLAGS+=-DGSSAPI -I${DESTDIR}/usr/include/gssapi
-CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5 -DHEIMDAL
+CPPFLAGS+=-DGSSAPI
+CPPFLAGS+=-DKRB5 -DHEIMDAL
 .endif
 
 .if (${USE_LDAP} != "no")
diff -r db93d96ce733 -r 3ec3f36901f2 crypto/external/bsd/openssh/dist/session.c
--- a/crypto/external/bsd/openssh/dist/session.c        Sun Apr 24 14:01:46 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/session.c        Sun Apr 24 14:09:39 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: session.c,v 1.5 2010/11/21 18:59:04 adam Exp $ */
+/*     $NetBSD: session.c,v 1.6 2011/04/24 14:09:39 elric Exp $        */
 /* $OpenBSD: session.c,v 1.256 2010/06/25 07:20:04 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: session.c,v 1.5 2010/11/21 18:59:04 adam Exp $");
+__RCSID("$NetBSD: session.c,v 1.6 2011/04/24 14:09:39 elric Exp $");
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/un.h>
@@ -88,7 +88,7 @@
 #include "sftp.h"
 
 #ifdef KRB5
-#include <kafs.h>
+#include <krb5/kafs.h>
 #endif
 
 #define IS_INTERNAL_SFTP(c) \