summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2009-03-20 18:09:19 +0000
committerGreg Hudson <ghudson@mit.edu>2009-03-20 18:09:19 +0000
commit602bc234c7836e33fb0feef608cea79c2d82ea8b (patch)
tree78673fd5ae2105e37d2de4c950985d2c7b00a5c3
parentffafb8455cde8a0c089512444457a74357a644c3 (diff)
downloadkrb5-602bc234c7836e33fb0feef608cea79c2d82ea8b.tar.gz
krb5-602bc234c7836e33fb0feef608cea79c2d82ea8b.tar.xz
krb5-602bc234c7836e33fb0feef608cea79c2d82ea8b.zip
Install kadmin and kdb headers
Add disclaimers to the kadmin and kdb headers about the weaker stability commitments we make for their APIs, and install them for the benefit of users who can tolerate such instability. (The kadmin interface is the real goal here, but the kadmin header includes kdb.h so we need to install both.) ticket: 6431 tags: pullup target_version: 1.7 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22112 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/config/pre.in1
-rw-r--r--src/include/Makefile.in1
-rw-r--r--src/include/kdb.h10
-rw-r--r--src/lib/kadm5/Makefile.in5
-rw-r--r--src/lib/kadm5/admin.h11
5 files changed, 28 insertions, 0 deletions
diff --git a/src/config/pre.in b/src/config/pre.in
index 7a4e2ca4fa..6923ade7d2 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -219,6 +219,7 @@ KRB5_AD_MODULE_DIR = $(MODULE_DIR)/authdata
KRB5_LIBKRB5_MODULE_DIR = $(MODULE_DIR)/libkrb5
GSS_MODULE_DIR = @libdir@/gss
KRB5_INCSUBDIRS = \
+ $(KRB5_INCDIR)/kadm5 \
$(KRB5_INCDIR)/krb5 \
$(KRB5_INCDIR)/gssapi \
$(KRB5_INCDIR)/gssrpc
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index f5482a1716..2b7cc08771 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -132,6 +132,7 @@ clean::
install-headers-unix install:: krb5/krb5.h profile.h
$(INSTALL_DATA) $(srcdir)/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h
+ $(INSTALL_DATA) $(srcdir)/kdb.h $(DESTDIR)$(KRB5_INCDIR)$(S)kdb.h
$(INSTALL_DATA) krb5/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)krb5.h
$(INSTALL_DATA) $(srcdir)/krb5/locate_plugin.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)locate_plugin.h
$(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h
diff --git a/src/include/kdb.h b/src/include/kdb.h
index 73b09c9e04..8b681ef814 100644
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -58,9 +58,19 @@
* Use is subject to license terms.
*/
+/* This API is not considered as stable as the main krb5 API.
+ *
+ * - We may make arbitrary incompatible changes between feature
+ * releases (e.g. from 1.7 to 1.8).
+ * - We will make some effort to avoid making incompatible changes for
+ * bugfix releases, but will make them if necessary.
+ */
+
#ifndef KRB5_KDB5__
#define KRB5_KDB5__
+#include <krb5.h>
+
/* Salt types */
#define KRB5_KDB_SALTTYPE_NORMAL 0
#define KRB5_KDB_SALTTYPE_V4 1
diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
index 2e4d809d39..4644937fec 100644
--- a/src/lib/kadm5/Makefile.in
+++ b/src/lib/kadm5/Makefile.in
@@ -98,5 +98,10 @@ clean-unix:: clean-libobjs
clean-windows::
+install-headers-unix install:: $(BUILD_HDRS)
+ $(INSTALL_DATA) $(srcdir)/admin.h $(DESTDIR)$(KRB5_INCDIR)$(S)kadm5$(S)admin.h
+ $(INSTALL_DATA) chpass_util_strings.h $(DESTDIR)$(KRB5_INCDIR)$(S)kadm5$(S)chpass_util_strings.h
+ $(INSTALL_DATA) kadm_err.h $(DESTDIR)$(KRB5_INCDIR)$(S)kadm5$(S)kadm_err.h
+
@libobj_frag@
diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h
index cdf2f4dc8d..a9e01768fd 100644
--- a/src/lib/kadm5/admin.h
+++ b/src/lib/kadm5/admin.h
@@ -30,6 +30,17 @@
* $Header$
*/
+/*
+ * This API is not considered as stable as the main krb5 API.
+ *
+ * - We may make arbitrary incompatible changes between feature
+ * releases (e.g. from 1.7 to 1.8).
+ * - We will make some effort to avoid making incompatible changes for
+ * bugfix releases, but will make them if necessary.
+ * - We make no commitments at all regarding the v1 API (obtained by
+ * defining USE_KADM5_API_VERSION to 1) and expect to remove it.
+ */
+
#ifndef __KADM5_ADMIN_H__
#define __KADM5_ADMIN_H__