Description: Move system GSS API headers out of the way.
 Install kernel GSS API headers into /usr/include/sys
 instead of /usr/include/gssapi to avoid conflicts with
 libkrb5-dev
Index: b/usr/src/uts/common/gssapi/Makefile
===================================================================
--- a/usr/src/uts/common/gssapi/Makefile	2014-03-01 22:52:30.776748841 +0400
+++ b/usr/src/uts/common/gssapi/Makefile	2014-03-01 22:53:46.149908994 +0400
@@ -37,7 +37,7 @@
 
 DERIVED_FILES=	gssd_prot.h gssd_prot.c gssd_xdr.c
 
-GSSDDIRS= $(ROOT)/usr/include/gssapi
+GSSDDIRS= $(ROOT)/usr/include/sys
 
 GSSDHDRS= $(INSTALLED_HDRS:%=$(GSSDDIRS)/%)
 
Index: b/usr/src/uts/common/gssapi/gssapi_ext.h
===================================================================
--- a/usr/src/uts/common/gssapi/gssapi_ext.h	2014-03-01 22:52:30.776852294 +0400
+++ b/usr/src/uts/common/gssapi/gssapi_ext.h	2014-03-01 22:53:46.151460655 +0400
@@ -31,7 +31,7 @@
 #ifndef _GSSAPI_EXT_H
 #define	_GSSAPI_EXT_H
 
-#include <gssapi/gssapi.h>
+#include <sys/gssapi.h>
 #ifdef	_KERNEL
 #include <sys/systm.h>
 #else
Index: b/usr/src/uts/common/sys/fs/autofs.h
===================================================================
--- a/usr/src/uts/common/sys/fs/autofs.h	2014-03-01 22:52:30.776967750 +0400
+++ b/usr/src/uts/common/sys/fs/autofs.h	2014-03-01 22:53:46.153830864 +0400
@@ -26,7 +26,7 @@
 #define	_SYS_FS_AUTOFS_H
 
 #include <rpc/clnt.h>
-#include <gssapi/gssapi.h>
+#include <sys/gssapi.h>
 #include <sys/vfs.h>
 #include <sys/dirent.h>
 #include <sys/types.h>
Index: b/usr/src/uts/common/gssapi/gssd_handle.c
===================================================================
--- a/usr/src/uts/common/gssapi/gssd_handle.c	2014-03-01 22:52:30.776870712 +0400
+++ b/usr/src/uts/common/gssapi/gssd_handle.c	2014-03-01 22:53:46.155015168 +0400
@@ -31,7 +31,7 @@
  */
 
 #include <sys/types.h>
-#include <gssapi/gssapi.h>
+#include <sys/gssapi.h>
 #include <gssapi/gssd_prot.h>
 #include <gssapi/kgssapi_defs.h>
 
Index: b/usr/src/uts/common/gssapi/include/gssapiP_dummy.h
===================================================================
--- a/usr/src/uts/common/gssapi/include/gssapiP_dummy.h	2014-03-01 22:52:30.776888040 +0400
+++ b/usr/src/uts/common/gssapi/include/gssapiP_dummy.h	2014-03-01 22:53:46.157018278 +0400
@@ -31,7 +31,7 @@
 extern "C" {
 #endif
 
-#include <gssapi/gssapi.h>
+#include <sys/gssapi.h>
 
 #define	SEC_CONTEXT_TOKEN 1
 #define	DUMMY_SIZE_OF_INT 4
Index: b/usr/src/uts/common/gssapi/mechs/krb5/include/gssapi_generic.h
===================================================================
--- a/usr/src/uts/common/gssapi/mechs/krb5/include/gssapi_generic.h	2014-03-01 22:52:30.776832582 +0400
+++ b/usr/src/uts/common/gssapi/mechs/krb5/include/gssapi_generic.h	2014-03-01 22:53:46.158679997 +0400
@@ -32,7 +32,7 @@
  * $Id: gssapi_generic.h 15252 2003-03-06 20:26:39Z lxs $
  */
 
-#include <gssapi/gssapi.h>
+#include <sys/gssapi.h>
 
 #if defined(__cplusplus) && !defined(GSSAPIGENERIC_BEGIN_DECLS)
 #define GSSAPIGENERIC_BEGIN_DECLS	extern "C" {
Index: b/usr/src/uts/common/gssapi/mechs/krb5/include/gssapi_krb5.h
===================================================================
--- a/usr/src/uts/common/gssapi/mechs/krb5/include/gssapi_krb5.h	2014-03-01 22:52:30.776804972 +0400
+++ b/usr/src/uts/common/gssapi/mechs/krb5/include/gssapi_krb5.h	2014-03-01 22:53:46.160563015 +0400
@@ -27,7 +27,7 @@
 #ifndef _GSSAPI_KRB5_H_
 #define _GSSAPI_KRB5_H_
 
-#include <gssapi/gssapi.h>
+#include <sys/gssapi.h>
 #include <gssapi/gssapi_ext.h>
 #include <krb5.h>
 
Index: b/usr/src/uts/common/rpc/rpcsec_defs.h
===================================================================
--- a/usr/src/uts/common/rpc/rpcsec_defs.h	2014-03-01 22:52:30.777024535 +0400
+++ b/usr/src/uts/common/rpc/rpcsec_defs.h	2014-03-01 22:53:46.162604667 +0400
@@ -39,7 +39,7 @@
 #include <libintl.h>
 #include <locale.h>
 #endif
-#include <gssapi/gssapi.h>
+#include <sys/gssapi.h>
 #include <rpc/types.h>
 
 #ifdef	__cplusplus
Index: b/usr/src/uts/common/rpc/rpcsec_gss.h
===================================================================
--- a/usr/src/uts/common/rpc/rpcsec_gss.h	2014-03-01 22:52:30.777003415 +0400
+++ b/usr/src/uts/common/rpc/rpcsec_gss.h	2014-03-01 22:53:46.165549652 +0400
@@ -40,7 +40,7 @@
 
 #include <rpc/auth.h>
 #include <rpc/clnt.h>
-#include <gssapi/gssapi.h>
+#include <sys/gssapi.h>
 
 /*
  * Interface definitions.
Index: b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c
===================================================================
--- a/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c	2014-03-01 22:52:30.777090469 +0400
+++ b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss.c	2014-03-01 22:53:46.171340611 +0400
@@ -33,7 +33,7 @@
 
 #include  <sys/systm.h>
 #include  <sys/types.h>
-#include  <gssapi/gssapi.h>
+#include  <sys/gssapi.h>
 #include  <rpc/rpc.h>
 #include  <rpc/rpcsec_defs.h>
 #include  <sys/debug.h>
Index: b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss_misc.c
===================================================================
--- a/usr/src/uts/common/rpc/sec_gss/rpcsec_gss_misc.c	2014-03-01 22:52:30.777072206 +0400
+++ b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss_misc.c	2014-03-01 22:53:46.171876799 +0400
@@ -41,7 +41,7 @@
 #include <sys/stream.h>
 #include <sys/strsubr.h>
 #include <sys/cmn_err.h>
-#include <gssapi/gssapi.h>
+#include <sys/gssapi.h>
 #include <rpc/rpc.h>
 #include <rpc/rpcsec_defs.h>
 
Index: b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss_utils.c
===================================================================
--- a/usr/src/uts/common/rpc/sec_gss/rpcsec_gss_utils.c	2014-03-01 22:52:30.777116785 +0400
+++ b/usr/src/uts/common/rpc/sec_gss/rpcsec_gss_utils.c	2014-03-01 22:53:46.173199511 +0400
@@ -29,7 +29,7 @@
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/cmn_err.h>
-#include <gssapi/gssapi.h>
+#include <sys/gssapi.h>
 #include <rpc/rpc.h>
 #include <rpc/rpcsec_defs.h>
 
Index: b/usr/src/uts/common/rpc/sec_gss/svc_rpcsec_gss.c
===================================================================
--- a/usr/src/uts/common/rpc/sec_gss/svc_rpcsec_gss.c	2014-03-01 22:52:30.777043216 +0400
+++ b/usr/src/uts/common/rpc/sec_gss/svc_rpcsec_gss.c	2014-03-01 22:53:46.176086811 +0400
@@ -39,7 +39,7 @@
 #include <sys/debug.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <gssapi/gssapi.h>
+#include <sys/gssapi.h>
 #include <gssapi/gssapi_ext.h>
 #include <rpc/rpc.h>
 #include <rpc/rpcsec_defs.h>