Add more missing headers in kernel subset directory. Hopefully the

whole set this time.

ticket: 6909

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

2 files changed, 101 insertions, 91 deletions

diff --git a/src/util/gss-kernel-lib/Makefile.in b/src/util/gss-kernel-lib/Makefile.in
index a0960d3328..6bf904ea99 100644
--- a/src/util/gss-kernel-lib/Makefile.in
+++ b/src/util/gss-kernel-lib/Makefile.in
@@ -75,7 +75,12 @@ HEADERS= \
 	krb5/krb5.h \
 	krb5/plugin.h \
 	krb5/preauth_plugin.h \
-	krb5/authdata_plugin.h
+	krb5/authdata_plugin.h \
+	profile.h \
+	$(MAYBE_COMERR_@COM_ERR_VERSION@)
+
+MAYBE_COMERR_k5 = com_err.h
+MAYBE_COMERR_sys =
 
 check-pytests:: t_kgss_user t_kgss_kernel
 	$(RUNPYTEST) $(srcdir)/t_kgss.py $(PYTESTFLAGS)
@@ -192,6 +197,10 @@ krb5/preauth_plugin.h: krb5 $(INCLUDE)/krb5/preauth_plugin.h
 	$(CP) $(INCLUDE)/krb5/preauth_plugin.h $@
 krb5/authdata_plugin.h: krb5 $(INCLUDE)/krb5/authdata_plugin.h
 	$(CP) $(INCLUDE)/krb5/authdata_plugin.h $@
+profile.h: $(INCLUDE_BUILD)/profile.h
+	$(CP) $(INCLUDE_BUILD)/profile.h $@
+com_err.h: $(INCLUDE_BUILD)/com_err.h
+	$(CP) $(INCLUDE_BUILD)/com_err.h $@
 
 gssapi:
 	test -d gssapi || mkdir gssapi
diff --git a/src/util/gss-kernel-lib/deps b/src/util/gss-kernel-lib/deps
index 7c911e2266..25bf0ec345 100644
--- a/src/util/gss-kernel-lib/deps
+++ b/src/util/gss-kernel-lib/deps
@@ -1,121 +1,122 @@
 # 
 # Generated makefile dependencies follow.
 #
-$(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_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 \
+$(OUTPRE)kernel_gss.$(OBJEXT): autoconf.h com_err.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_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 profile.h socket-utils.h
+$(OUTPRE)k5seal.$(OBJEXT): autoconf.h com_err.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_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_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 \
+  port-sockets.h profile.h socket-utils.h
+$(OUTPRE)k5sealiov.$(OBJEXT): autoconf.h com_err.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_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 profile.h socket-utils.h
+$(OUTPRE)k5unseal.$(OBJEXT): autoconf.h com_err.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_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_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 \
+  port-sockets.h profile.h socket-utils.h
+$(OUTPRE)k5unsealiov.$(OBJEXT): autoconf.h com_err.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_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 profile.h socket-utils.h
+$(OUTPRE)k5sealv3.$(OBJEXT): autoconf.h com_err.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_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_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_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 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_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 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_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 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_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 \
+  port-sockets.h profile.h socket-utils.h
+$(OUTPRE)k5sealv3iov.$(OBJEXT): autoconf.h com_err.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_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 profile.h socket-utils.h
+$(OUTPRE)util_cksum.$(OBJEXT): autoconf.h com_err.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_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 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 \
+  port-sockets.h profile.h socket-utils.h util_cksum.c
+$(OUTPRE)util_crypt.$(OBJEXT): autoconf.h com_err.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_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 t_kgss_common.c
-$(OUTPRE)t_kgss_user.$(OBJEXT): autoconf.h gssapi/gssapi.h \
-  gssapi/gssapi_ext.h gssapi/gssapi_krb5.h k5-buf.h k5-err.h \
+  port-sockets.h profile.h socket-utils.h util_crypt.c
+$(OUTPRE)util_seqnum.$(OBJEXT): autoconf.h com_err.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_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 t_kgss_common.h t_kgss_user.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 \
+  port-sockets.h profile.h socket-utils.h util_seqnum.c
+$(OUTPRE)util_seed.$(OBJEXT): autoconf.h com_err.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_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 t_kgss_kernel.c
+  port-sockets.h profile.h socket-utils.h util_seed.c
+$(OUTPRE)util_token.$(OBJEXT): autoconf.h com_err.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 com_err.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 com_err.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 com_err.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 profile.h socket-utils.h t_kgss_common.c
+$(OUTPRE)t_kgss_user.$(OBJEXT): autoconf.h com_err.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 profile.h socket-utils.h t_kgss_common.h \
+  t_kgss_user.c
+$(OUTPRE)t_kgss_kernel.$(OBJEXT): autoconf.h com_err.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 profile.h socket-utils.h t_kgss_kernel.c