Add more missing headers in kernel subset directory

ticket: 6909

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24924 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 109 insertions, 84 deletions

diff --git a/src/util/gss-kernel-lib/Makefile.in b/src/util/gss-kernel-lib/Makefile.in
index 1fc2807c63..6ccfd3e600 100644
--- a/src/util/gss-kernel-lib/Makefile.in
+++ b/src/util/gss-kernel-lib/Makefile.in
@@ -4,7 +4,7 @@ BUILDTOP=$(REL)..$(S)..
 KRB5_RUN_ENV=@KRB5_RUN_ENV@
 
 DEFINES=-DKRB5_KERNEL
-ALL_CFLAGS=$(CFLAGS) $(DEFS) $(DEFINES) -I.
+ALL_CFLAGS=$(CFLAGS) $(DEFS) $(DEFINES) -I. -Igssapi
 
 SHLIB_EXPDEPS = \
 	$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
@@ -48,13 +48,15 @@ OBJS= \
 	util_ordering.o
 
 HEADERS= \
+	gssapi/gssapi.h \
+	gssapi/gssapi_krb5.h \
+	gssapi/gssapi_ext.h \
+	gssapi.h \
 	gssapiP_krb5.h \
-	gssapi_krb5.h \
 	gssapi_err_krb5.h \
 	gssapiP_generic.h \
 	gssapi_generic.h \
 	gssapi_err_generic.h \
-	gssapi_ext.h \
 	k5-int.h \
 	k5-int-pkinit.h \
 	k5-thread.h \
@@ -94,7 +96,7 @@ depend:: $(SRCS) $(HEADERS)
 
 clean::
 	$(RM) $(SRCS) $(HEADERS) libkgss.a testlog OBJS.SH
-	$(RM) -r krb5 testdir
+	$(RM) -r gssapi krb5 testdir
 	$(RM) t_kgss_user.o t_kgss_kernel.o t_kgss_common.o
 	$(RM) t_kgss_user t_kgss_kernel
 
@@ -135,10 +137,16 @@ util_ordering.c: $(GSS_GENERIC)/util_ordering.c
 	$(CP) $(GSS_GENERIC)/util_ordering.c $@
 
 # Rules to copy headers from their real homes in the source or build tree.
+gssapi.h: $(INCLUDE)/gssapi.h
+	$(CP) $(INCLUDE)/gssapi.h $@
+gssapi/gssapi.h: gssapi $(GSS_GENERIC_BUILD)/gssapi.h
+	$(CP) $(GSS_GENERIC_BUILD)/gssapi.h $@
+gssapi/gssapi_krb5.h: gssapi $(GSS_KRB5_BUILD)/gssapi_krb5.h
+	$(CP) $(GSS_KRB5_BUILD)/gssapi_krb5.h $@
+gssapi/gssapi_ext.h: gssapi $(GSS_GENERIC)/gssapi_ext.h
+	$(CP) $(GSS_GENERIC)/gssapi_ext.h $@
 gssapiP_krb5.h: $(GSS_KRB5)/gssapiP_krb5.h
 	$(CP) $(GSS_KRB5)/gssapiP_krb5.h $@
-gssapi_krb5.h: $(GSS_KRB5_BUILD)/gssapi_krb5.h
-	$(CP) $(GSS_KRB5_BUILD)/gssapi_krb5.h $@
 gssapi_err_krb5.h: $(GSS_KRB5_BUILD)/gssapi_err_krb5.h
 	$(CP) $(GSS_KRB5_BUILD)/gssapi_err_krb5.h $@
 gssapiP_generic.h: $(GSS_GENERIC)/gssapiP_generic.h
@@ -147,8 +155,6 @@ gssapi_generic.h: $(GSS_GENERIC)/gssapi_generic.h
 	$(CP) $(GSS_GENERIC)/gssapi_generic.h $@
 gssapi_err_generic.h: $(GSS_GENERIC_BUILD)/gssapi_err_generic.h
 	$(CP) $(GSS_GENERIC_BUILD)/gssapi_err_generic.h $@
-gssapi_ext.h: $(GSS_GENERIC)/gssapi_ext.h
-	$(CP) $(GSS_GENERIC)/gssapi_ext.h $@
 k5-int.h: $(INCLUDE)/k5-int.h
 	$(CP) $(INCLUDE)/k5-int.h $@
 k5-int-pkinit.h: $(INCLUDE)/k5-int-pkinit.h
@@ -186,6 +192,8 @@ krb5/preauth_plugin.h: krb5 $(INCLUDE)/krb5/preauth_plugin.h
 krb5/authdata_plugin.h: krb5 $(INCLUDE)/krb5/authdata_plugin.h
 	$(CP) $(INCLUDE)/krb5/authdata_plugin.h $@
 
+gssapi:
+	test -d gssapi || mkdir gssapi
 krb5:
 	test -d krb5 || mkdir krb5
 
diff --git a/src/util/gss-kernel-lib/deps b/src/util/gss-kernel-lib/deps
index 0773c93054..7c911e2266 100644
--- a/src/util/gss-kernel-lib/deps
+++ b/src/util/gss-kernel-lib/deps
@@ -1,104 +1,121 @@
 # 
 # Generated makefile dependencies follow.
 #
-$(OUTPRE)kernel_gss.$(OBJEXT): autoconf.h gssapiP_generic.h \
+$(OUTPRE)kernel_gss.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
-  gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
-  k5-plugin.h k5-thread.h k5-trace.h kernel_gss.c krb5.h \
-  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
-  osconf.h port-sockets.h socket-utils.h
-$(OUTPRE)k5seal.$(OBJEXT): autoconf.h gssapiP_generic.h \
+  gssapi_generic.h k5-buf.h k5-err.h k5-gmt_mktime.h \
+  k5-int-pkinit.h k5-int.h k5-platform.h k5-plugin.h \
+  k5-thread.h k5-trace.h kernel_gss.c krb5.h krb5/authdata_plugin.h \
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h
+$(OUTPRE)k5seal.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
-  gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
-  k5-plugin.h k5-thread.h k5-trace.h k5seal.c krb5.h \
-  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
-  osconf.h port-sockets.h socket-utils.h
-$(OUTPRE)k5sealiov.$(OBJEXT): autoconf.h gssapiP_generic.h \
+  gssapi_generic.h k5-buf.h k5-err.h k5-gmt_mktime.h \
+  k5-int-pkinit.h k5-int.h k5-platform.h k5-plugin.h \
+  k5-thread.h k5-trace.h k5seal.c krb5.h krb5/authdata_plugin.h \
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h
+$(OUTPRE)k5sealiov.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
-  gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
-  k5-plugin.h k5-thread.h k5-trace.h k5sealiov.c krb5.h \
-  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
-  osconf.h port-sockets.h socket-utils.h
-$(OUTPRE)k5unseal.$(OBJEXT): autoconf.h gssapiP_generic.h \
+  gssapi_generic.h k5-buf.h k5-err.h k5-gmt_mktime.h \
+  k5-int-pkinit.h k5-int.h k5-platform.h k5-plugin.h \
+  k5-thread.h k5-trace.h k5sealiov.c krb5.h krb5/authdata_plugin.h \
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h
+$(OUTPRE)k5unseal.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
-  gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
-  k5-plugin.h k5-thread.h k5-trace.h k5unseal.c krb5.h \
-  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
-  osconf.h port-sockets.h socket-utils.h
-$(OUTPRE)k5unsealiov.$(OBJEXT): autoconf.h gssapiP_generic.h \
+  gssapi_generic.h k5-buf.h k5-err.h k5-gmt_mktime.h \
+  k5-int-pkinit.h k5-int.h k5-platform.h k5-plugin.h \
+  k5-thread.h k5-trace.h k5unseal.c krb5.h krb5/authdata_plugin.h \
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h
+$(OUTPRE)k5unsealiov.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
-  gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
-  k5-plugin.h k5-thread.h k5-trace.h k5unsealiov.c krb5.h \
-  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
-  osconf.h port-sockets.h socket-utils.h
-$(OUTPRE)k5sealv3.$(OBJEXT): autoconf.h gssapiP_generic.h \
+  gssapi_generic.h k5-buf.h k5-err.h k5-gmt_mktime.h \
+  k5-int-pkinit.h k5-int.h k5-platform.h k5-plugin.h \
+  k5-thread.h k5-trace.h k5unsealiov.c krb5.h krb5/authdata_plugin.h \
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h
+$(OUTPRE)k5sealv3.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
-  gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
-  k5-plugin.h k5-thread.h k5-trace.h k5sealv3.c krb5.h \
-  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
-  osconf.h port-sockets.h socket-utils.h
-$(OUTPRE)k5sealv3iov.$(OBJEXT): autoconf.h gssapiP_generic.h \
+  gssapi_generic.h k5-buf.h k5-err.h k5-gmt_mktime.h \
+  k5-int-pkinit.h k5-int.h k5-platform.h k5-plugin.h \
+  k5-thread.h k5-trace.h k5sealv3.c krb5.h krb5/authdata_plugin.h \
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h
+$(OUTPRE)k5sealv3iov.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
-  gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
-  k5-plugin.h k5-thread.h k5-trace.h k5sealv3iov.c krb5.h \
-  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
-  osconf.h port-sockets.h socket-utils.h
-$(OUTPRE)util_cksum.$(OBJEXT): autoconf.h gssapiP_generic.h \
+  gssapi_generic.h k5-buf.h k5-err.h k5-gmt_mktime.h \
+  k5-int-pkinit.h k5-int.h k5-platform.h k5-plugin.h \
+  k5-thread.h k5-trace.h k5sealv3iov.c krb5.h krb5/authdata_plugin.h \
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h
+$(OUTPRE)util_cksum.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
-  gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
-  k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
+  gssapi_generic.h k5-buf.h k5-err.h k5-gmt_mktime.h \
+  k5-int-pkinit.h k5-int.h k5-platform.h k5-plugin.h \
+  k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
   krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
   port-sockets.h socket-utils.h util_cksum.c
-$(OUTPRE)util_crypt.$(OBJEXT): autoconf.h gssapiP_generic.h \
+$(OUTPRE)util_crypt.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
-  gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
-  k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
+  gssapi_generic.h k5-buf.h k5-err.h k5-gmt_mktime.h \
+  k5-int-pkinit.h k5-int.h k5-platform.h k5-plugin.h \
+  k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
   krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
   port-sockets.h socket-utils.h util_crypt.c
-$(OUTPRE)util_seqnum.$(OBJEXT): autoconf.h gssapiP_generic.h \
+$(OUTPRE)util_seqnum.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
-  gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
-  k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
+  gssapi_generic.h k5-buf.h k5-err.h k5-gmt_mktime.h \
+  k5-int-pkinit.h k5-int.h k5-platform.h k5-plugin.h \
+  k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
   krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
   port-sockets.h socket-utils.h util_seqnum.c
-$(OUTPRE)util_seed.$(OBJEXT): autoconf.h gssapiP_generic.h \
+$(OUTPRE)util_seed.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h gssapiP_generic.h \
   gssapiP_krb5.h gssapi_err_generic.h gssapi_err_krb5.h \
-  gssapi_ext.h gssapi_generic.h gssapi_krb5.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
-  k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
+  gssapi_generic.h k5-buf.h k5-err.h k5-gmt_mktime.h \
+  k5-int-pkinit.h k5-int.h k5-platform.h k5-plugin.h \
+  k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
   krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
   port-sockets.h socket-utils.h util_seed.c
-$(OUTPRE)util_token.$(OBJEXT): autoconf.h gssapiP_generic.h \
-  gssapi_err_generic.h gssapi_ext.h gssapi_generic.h \
-  k5-buf.h k5-platform.h k5-thread.h util_token.c
-$(OUTPRE)util_set.$(OBJEXT): autoconf.h gssapiP_generic.h \
-  gssapi_err_generic.h gssapi_ext.h gssapi_generic.h \
-  k5-buf.h k5-platform.h k5-thread.h util_set.c
-$(OUTPRE)util_ordering.$(OBJEXT): autoconf.h gssapiP_generic.h \
-  gssapi_err_generic.h gssapi_ext.h gssapi_generic.h \
-  k5-buf.h k5-platform.h k5-thread.h util_ordering.c
-$(OUTPRE)t_kgss_common.$(OBJEXT): autoconf.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
+$(OUTPRE)util_token.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapiP_generic.h gssapi_err_generic.h \
+  gssapi_generic.h k5-buf.h k5-platform.h k5-thread.h \
+  util_token.c
+$(OUTPRE)util_set.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapiP_generic.h gssapi_err_generic.h \
+  gssapi_generic.h k5-buf.h k5-platform.h k5-thread.h \
+  util_set.c
+$(OUTPRE)util_ordering.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapiP_generic.h gssapi_err_generic.h \
+  gssapi_generic.h k5-buf.h k5-platform.h k5-thread.h \
+  util_ordering.c
+$(OUTPRE)t_kgss_common.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h k5-buf.h k5-err.h \
+  k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
   krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
   port-sockets.h socket-utils.h t_kgss_common.c
-$(OUTPRE)t_kgss_user.$(OBJEXT): autoconf.h k5-buf.h \
-  k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
+$(OUTPRE)t_kgss_user.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h k5-buf.h k5-err.h \
+  k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
   k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
   krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
   port-sockets.h socket-utils.h t_kgss_common.h t_kgss_user.c
-$(OUTPRE)t_kgss_kernel.$(OBJEXT): autoconf.h gssapi_krb5.h \
-  k5-buf.h k5-err.h k5-gmt_mktime.h k5-int-pkinit.h k5-int.h \
-  k5-platform.h k5-plugin.h k5-thread.h k5-trace.h krb5.h \
-  krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h \
-  osconf.h port-sockets.h socket-utils.h t_kgss_kernel.c
+$(OUTPRE)t_kgss_kernel.$(OBJEXT): autoconf.h gssapi/gssapi.h \
+  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h k5-buf.h k5-err.h \
+  k5-gmt_mktime.h k5-int-pkinit.h k5-int.h k5-platform.h \
+  k5-plugin.h k5-thread.h k5-trace.h krb5.h krb5/authdata_plugin.h \
+  krb5/krb5.h krb5/plugin.h krb5/preauth_plugin.h osconf.h \
+  port-sockets.h socket-utils.h t_kgss_kernel.c