From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 8 Mar 2022 09:49:31 +0000 (+1300)
Subject: s4:kdc: Expose samba_kdc_message2entry_keys()
X-Git-Tag: tevent-0.12.0~279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1d65d271ecda41dc13627bbca213181dac28c41;p=thirdparty%2Fsamba.git

s4:kdc: Expose samba_kdc_message2entry_keys()

This allows the KDC to share the supplementalCredentials parsing code
with other parts of Samba that could use it.

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Mar 24 10:17:32 UTC 2022 on sn-devel-184
---

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 16efb8d27fb..dbe9276350c 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -54,10 +54,6 @@
 	((krb5_kvno)((((uint32_t)kvno) & 0xFFFF) | \
 	 ((((uint32_t)krbtgt) << 16) & 0xFFFF0000)))
 
-enum samba_kdc_ent_type
-{ SAMBA_KDC_ENT_TYPE_CLIENT, SAMBA_KDC_ENT_TYPE_SERVER,
-  SAMBA_KDC_ENT_TYPE_KRBTGT, SAMBA_KDC_ENT_TYPE_TRUST, SAMBA_KDC_ENT_TYPE_ANY };
-
 enum trust_direction {
 	UNKNOWN = 0,
 	INBOUND = LSA_TRUST_DIRECTION_INBOUND,
@@ -573,18 +569,18 @@ fail:
 	return ret;
 }
 
-static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
-						    TALLOC_CTX *mem_ctx,
-						    const struct ldb_message *msg,
-						    bool is_krbtgt,
-						    bool is_rodc,
-						    uint32_t userAccountControl,
-						    enum samba_kdc_ent_type ent_type,
-						    unsigned flags,
-						    krb5_kvno requested_kvno,
-						    struct sdb_entry *entry,
-						    const uint32_t supported_enctypes_in,
-						    uint32_t *supported_enctypes_out)
+krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
+					     TALLOC_CTX *mem_ctx,
+					     const struct ldb_message *msg,
+					     bool is_krbtgt,
+					     bool is_rodc,
+					     uint32_t userAccountControl,
+					     enum samba_kdc_ent_type ent_type,
+					     unsigned flags,
+					     krb5_kvno requested_kvno,
+					     struct sdb_entry *entry,
+					     const uint32_t supported_enctypes_in,
+					     uint32_t *supported_enctypes_out)
 {
 	krb5_error_code ret = 0;
 	enum ndr_err_code ndr_err;
diff --git a/source4/kdc/db-glue.h b/source4/kdc/db-glue.h
index 6779a87eadf..b8d936ba662 100644
--- a/source4/kdc/db-glue.h
+++ b/source4/kdc/db-glue.h
@@ -24,6 +24,34 @@
 struct sdb_keys;
 struct sdb_entry;
 
+struct samba_kdc_base_context;
+struct samba_kdc_db_context;
+struct samba_kdc_entry;
+
+enum samba_kdc_ent_type {
+	SAMBA_KDC_ENT_TYPE_CLIENT,
+	SAMBA_KDC_ENT_TYPE_SERVER,
+	SAMBA_KDC_ENT_TYPE_KRBTGT,
+	SAMBA_KDC_ENT_TYPE_TRUST,
+	SAMBA_KDC_ENT_TYPE_ANY
+};
+
+/*
+ * This allows DSDB to parse Kerberos keys without duplicating this
+ * difficulty
+ */
+krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
+					     TALLOC_CTX *mem_ctx,
+					     const struct ldb_message *msg,
+					     bool is_krbtgt,
+					     bool is_rodc,
+					     uint32_t userAccountControl,
+					     enum samba_kdc_ent_type ent_type,
+					     unsigned flags,
+					     krb5_kvno requested_kvno,
+					     struct sdb_entry *entry,
+					     const uint32_t supported_enctypes_in,
+					     uint32_t *supported_enctypes_out);
 
 int samba_kdc_set_fixed_keys(krb5_context context,
 			     const struct ldb_val *secretbuffer,