Add krb5_db_register_keytab()

Add a public libkdb5 function to register the KDB keytab type.  This
functionality is needed for out-of-tree KDC servers such as the Samba
kpasswd service.

[ghudson@mit.edu: edited comments, whitespace, commit message]

ticket: 8494 (new)

diff --git a/src/include/kdb.h b/src/include/kdb.h
index c6dd15f46d86f58ef12889ce5229b44cfd09b9f5..e9d1a84ba1af8b1bd88fb869e12d70be76a00796 100644 (file)
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -837,6 +837,13 @@ krb5_dbe_free_strings(krb5_context, krb5_string_attr *, int count);
 void
 krb5_dbe_free_string(krb5_context, char *);
 
+/*
+ * Register the KDB keytab type, allowing "KDB:" to be used as a keytab name.
+ * For this type to work, the context used for keytab operations must have an
+ * associated database handle (via krb5_db_open()).
+ */
+krb5_error_code krb5_db_register_keytab(krb5_context context);
+
 #define KRB5_KDB_DEF_FLAGS      0
 
 #define KDB_MAX_DB_NAME                 128

diff --git a/src/lib/kdb/keytab.c b/src/lib/kdb/keytab.c
index b85b67daac7f1e1239a179e4314e79b5f8c4bdfc..c6aa100daf287d24803c7cf593034f113a317110 100644 (file)
--- a/src/lib/kdb/keytab.c
+++ b/src/lib/kdb/keytab.c
@@ -65,6 +65,12 @@ typedef struct krb5_ktkdb_data {
     char * name;
 } krb5_ktkdb_data;
 
+krb5_error_code
+krb5_db_register_keytab(krb5_context context)
+{
+    return krb5_kt_register(context, &krb5_kt_kdb_ops);
+}
+
 krb5_error_code
 krb5_ktkdb_resolve(context, name, id)
     krb5_context          context;

diff --git a/src/lib/kdb/libkdb5.exports b/src/lib/kdb/libkdb5.exports
index f7b3061d4a8b9405ec3aaa925aac9dbbade42eac..5df596aa47d2ae7282bc6e85c448ae42b3cd0770 100644 (file)
--- a/src/lib/kdb/libkdb5.exports
+++ b/src/lib/kdb/libkdb5.exports
@@ -87,6 +87,7 @@ krb5_db_delete_policy
 krb5_db_free_policy
 krb5_def_store_mkey_list
 krb5_db_promote
+krb5_db_register_keytab
 ulog_add_update
 ulog_init_header
 ulog_map