Separate clpreauth and kdcpreauth interfaces

Since there is no overlap between the clpreauth and kdcpreauth
interface declarations, there's no particular reason to combine them
into one header.  For backward compatibility and convenience, leave
behind a preauth_plugin.h which includes both.

2 files changed, 38 insertions, 34 deletions

diff --git a/src/util/gss-kernel-lib/Makefile.in b/src/util/gss-kernel-lib/Makefile.in
index 50d66e4656..0c57976469 100644
--- a/src/util/gss-kernel-lib/Makefile.in
+++ b/src/util/gss-kernel-lib/Makefile.in
@@ -80,7 +80,7 @@ HEADERS= \
 	socket-utils.h \
 	krb5/krb5.h \
 	krb5/plugin.h \
-	krb5/preauth_plugin.h \
+	krb5/clpreauth_plugin.h \
 	krb5/authdata_plugin.h \
 	profile.h \
 	$(COM_ERR_DEPS)
@@ -199,8 +199,8 @@ krb5/krb5.h: krb5 $(INCLUDE_BUILD)/krb5/krb5.h
 	$(CP) $(INCLUDE_BUILD)/krb5/krb5.h $@
 krb5/plugin.h: krb5 $(INCLUDE)/krb5/plugin.h
 	$(CP) $(INCLUDE)/krb5/plugin.h $@
-krb5/preauth_plugin.h: krb5 $(INCLUDE)/krb5/preauth_plugin.h
-	$(CP) $(INCLUDE)/krb5/preauth_plugin.h $@
+krb5/clpreauth_plugin.h: krb5 $(INCLUDE)/krb5/clpreauth_plugin.h
+	$(CP) $(INCLUDE)/krb5/clpreauth_plugin.h $@
 krb5/authdata_plugin.h: krb5 $(INCLUDE)/krb5/authdata_plugin.h
 	$(CP) $(INCLUDE)/krb5/authdata_plugin.h $@
 profile.h: $(INCLUDE_BUILD)/profile.h
diff --git a/src/util/gss-kernel-lib/deps b/src/util/gss-kernel-lib/deps
index 06475bf1a4..a86df341d3 100644
--- a/src/util/gss-kernel-lib/deps
+++ b/src/util/gss-kernel-lib/deps
@@ -7,8 +7,8 @@ $(OUTPRE)k5seal.$(OBJEXT): $(COM_ERR_DEPS) autoconf.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 profile.h \
+  krb5.h krb5/authdata_plugin.h krb5/clpreauth_plugin.h \
+  krb5/krb5.h krb5/plugin.h osconf.h port-sockets.h profile.h \
   socket-utils.h
 $(OUTPRE)k5sealiov.$(OBJEXT): $(COM_ERR_DEPS) autoconf.h \
   gssapi/gssapi.h gssapi/gssapi_alloc.h gssapi/gssapi_ext.h \
@@ -16,8 +16,8 @@ $(OUTPRE)k5sealiov.$(OBJEXT): $(COM_ERR_DEPS) autoconf.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 \
+  krb5.h krb5/authdata_plugin.h krb5/clpreauth_plugin.h \
+  krb5/krb5.h krb5/plugin.h osconf.h port-sockets.h profile.h \
   socket-utils.h
 $(OUTPRE)k5unseal.$(OBJEXT): $(COM_ERR_DEPS) autoconf.h \
   gssapi/gssapi.h gssapi/gssapi_alloc.h gssapi/gssapi_ext.h \
@@ -25,8 +25,8 @@ $(OUTPRE)k5unseal.$(OBJEXT): $(COM_ERR_DEPS) autoconf.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 profile.h \
+  krb5.h krb5/authdata_plugin.h krb5/clpreauth_plugin.h \
+  krb5/krb5.h krb5/plugin.h osconf.h port-sockets.h profile.h \
   socket-utils.h
 $(OUTPRE)k5unsealiov.$(OBJEXT): $(COM_ERR_DEPS) autoconf.h \
   gssapi/gssapi.h gssapi/gssapi_alloc.h gssapi/gssapi_ext.h \
@@ -34,8 +34,8 @@ $(OUTPRE)k5unsealiov.$(OBJEXT): $(COM_ERR_DEPS) autoconf.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 \
+  krb5.h krb5/authdata_plugin.h krb5/clpreauth_plugin.h \
+  krb5/krb5.h krb5/plugin.h osconf.h port-sockets.h profile.h \
   socket-utils.h
 $(OUTPRE)k5sealv3.$(OBJEXT): $(COM_ERR_DEPS) autoconf.h \
   gssapi/gssapi.h gssapi/gssapi_alloc.h gssapi/gssapi_ext.h \
@@ -43,8 +43,8 @@ $(OUTPRE)k5sealv3.$(OBJEXT): $(COM_ERR_DEPS) autoconf.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 profile.h \
+  krb5.h krb5/authdata_plugin.h krb5/clpreauth_plugin.h \
+  krb5/krb5.h krb5/plugin.h osconf.h port-sockets.h profile.h \
   socket-utils.h
 $(OUTPRE)k5sealv3iov.$(OBJEXT): $(COM_ERR_DEPS) autoconf.h \
   gssapi/gssapi.h gssapi/gssapi_alloc.h gssapi/gssapi_ext.h \
@@ -52,8 +52,8 @@ $(OUTPRE)k5sealv3iov.$(OBJEXT): $(COM_ERR_DEPS) autoconf.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 \
+  krb5.h krb5/authdata_plugin.h krb5/clpreauth_plugin.h \
+  krb5/krb5.h krb5/plugin.h osconf.h port-sockets.h profile.h \
   socket-utils.h
 $(OUTPRE)util_cksum.$(OBJEXT): $(COM_ERR_DEPS) autoconf.h \
   gssapi/gssapi.h gssapi/gssapi_alloc.h gssapi/gssapi_ext.h \
@@ -61,32 +61,36 @@ $(OUTPRE)util_cksum.$(OBJEXT): $(COM_ERR_DEPS) autoconf.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 profile.h socket-utils.h util_cksum.c
+  krb5/authdata_plugin.h krb5/clpreauth_plugin.h krb5/krb5.h \
+  krb5/plugin.h osconf.h port-sockets.h profile.h socket-utils.h \
+  util_cksum.c
 $(OUTPRE)util_crypt.$(OBJEXT): $(COM_ERR_DEPS) autoconf.h \
   gssapi/gssapi.h gssapi/gssapi_alloc.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 profile.h socket-utils.h util_crypt.c
+  krb5/authdata_plugin.h krb5/clpreauth_plugin.h krb5/krb5.h \
+  krb5/plugin.h osconf.h port-sockets.h profile.h socket-utils.h \
+  util_crypt.c
 $(OUTPRE)util_seqnum.$(OBJEXT): $(COM_ERR_DEPS) autoconf.h \
   gssapi/gssapi.h gssapi/gssapi_alloc.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 profile.h socket-utils.h util_seqnum.c
+  krb5/authdata_plugin.h krb5/clpreauth_plugin.h krb5/krb5.h \
+  krb5/plugin.h osconf.h port-sockets.h profile.h socket-utils.h \
+  util_seqnum.c
 $(OUTPRE)util_seed.$(OBJEXT): $(COM_ERR_DEPS) autoconf.h \
   gssapi/gssapi.h gssapi/gssapi_alloc.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 profile.h socket-utils.h util_seed.c
+  krb5/authdata_plugin.h krb5/clpreauth_plugin.h krb5/krb5.h \
+  krb5/plugin.h osconf.h port-sockets.h profile.h socket-utils.h \
+  util_seed.c
 $(OUTPRE)util_token.$(OBJEXT): $(COM_ERR_DEPS) autoconf.h \
   gssapi/gssapi.h gssapi/gssapi_alloc.h gssapi/gssapi_ext.h \
   gssapiP_generic.h gssapi_err_generic.h gssapi_generic.h \
@@ -105,29 +109,29 @@ $(OUTPRE)kernel_gss.$(OBJEXT): $(COM_ERR_DEPS) autoconf.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 \
-  kernel_gss.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
+  kernel_gss.h krb5.h krb5/authdata_plugin.h krb5/clpreauth_plugin.h \
+  krb5/krb5.h krb5/plugin.h osconf.h port-sockets.h profile.h \
+  socket-utils.h
 $(OUTPRE)t_kgss_common.$(OBJEXT): $(COM_ERR_DEPS) 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 profile.h socket-utils.h t_kgss_common.c \
-  t_kgss_common.h
+  krb5/authdata_plugin.h krb5/clpreauth_plugin.h krb5/krb5.h \
+  krb5/plugin.h osconf.h port-sockets.h profile.h socket-utils.h \
+  t_kgss_common.c t_kgss_common.h
 $(OUTPRE)t_kgss_user.$(OBJEXT): $(COM_ERR_DEPS) 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 profile.h socket-utils.h t_kgss_common.h \
-  t_kgss_user.c
+  krb5/authdata_plugin.h krb5/clpreauth_plugin.h krb5/krb5.h \
+  krb5/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): $(COM_ERR_DEPS) autoconf.h \
   gssapi/gssapi.h gssapi/gssapi_alloc.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.h \
-  krb5.h krb5/authdata_plugin.h krb5/krb5.h krb5/plugin.h \
-  krb5/preauth_plugin.h osconf.h port-sockets.h profile.h \
+  krb5.h krb5/authdata_plugin.h krb5/clpreauth_plugin.h \
+  krb5/krb5.h krb5/plugin.h osconf.h port-sockets.h profile.h \
   socket-utils.h t_kgss_common.h t_kgss_kernel.c