Module Name: src
Committed By: elric
Date: Sun Apr 24 14:09:39 UTC 2011
Modified Files:
src/crypto/external/bsd/openssh: Makefile.inc
src/crypto/external/bsd/openssh/dist: session.c
Log Message:
Stop using -I/usr/include/gssapi and -I/usr/include/krb5. We must in this
case find kafs.h as krb5/kafs.h.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/session.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/Makefile.inc
diff -u src/crypto/external/bsd/openssh/Makefile.inc:1.2 src/crypto/external/bsd/openssh/Makefile.inc:1.3
--- src/crypto/external/bsd/openssh/Makefile.inc:1.2 Sun Nov 21 19:19:21 2010
+++ src/crypto/external/bsd/openssh/Makefile.inc Sun Apr 24 14:09:39 2011
@@ -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")
Index: src/crypto/external/bsd/openssh/dist/session.c
diff -u src/crypto/external/bsd/openssh/dist/session.c:1.5 src/crypto/external/bsd/openssh/dist/session.c:1.6
--- src/crypto/external/bsd/openssh/dist/session.c:1.5 Sun Nov 21 18:59:04 2010
+++ src/crypto/external/bsd/openssh/dist/session.c Sun Apr 24 14:09:39 2011
@@ -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 <y...@cs.hut.fi>, 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) \
