s4:kdc: only pass sdb_keys to samba_kdc_set_fixed_keys()

This prepares the removal of sdb_entry_ex.

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

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index dec8f6863c184c4e41248275ac7bc6b1d6f333c1..7d7f98db1e3c70175b33c4fc54d14adfef098646 100644 (file)
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -339,16 +339,16 @@ int samba_kdc_set_fixed_keys(krb5_context context,
                             struct samba_kdc_db_context *kdc_db_ctx,
                             const struct ldb_val *secretbuffer,
                             bool is_protected,
-                            struct sdb_entry_ex *entry_ex)
+                            struct sdb_keys *keys)
 {
        uint32_t supported_enctypes = ENC_ALL_TYPES;
        uint16_t allocated_keys = 0;
        int ret;
 
        allocated_keys = 3;
-       entry_ex->entry.keys.len = 0;
-       entry_ex->entry.keys.val = calloc(allocated_keys, sizeof(struct sdb_key));
-       if (entry_ex->entry.keys.val == NULL) {
+       keys->len = 0;
+       keys->val = calloc(allocated_keys, sizeof(struct sdb_key));
+       if (keys->val == NULL) {
                memset(secretbuffer->data, 0, secretbuffer->length);
                ret = ENOMEM;
                goto out;
@@ -371,8 +371,8 @@ int samba_kdc_set_fixed_keys(krb5_context context,
                        goto out;
                }
 
-               entry_ex->entry.keys.val[entry_ex->entry.keys.len] = key;
-               entry_ex->entry.keys.len++;
+               keys->val[keys->len] = key;
+               keys->len++;
        }
 
        if (supported_enctypes & ENC_HMAC_SHA1_96_AES128) {
@@ -388,8 +388,8 @@ int samba_kdc_set_fixed_keys(krb5_context context,
                        goto out;
                }
 
-               entry_ex->entry.keys.val[entry_ex->entry.keys.len] = key;
-               entry_ex->entry.keys.len++;
+               keys->val[keys->len] = key;
+               keys->len++;
        }
 
        if (supported_enctypes & ENC_RC4_HMAC_MD5) {
@@ -405,8 +405,8 @@ int samba_kdc_set_fixed_keys(krb5_context context,
                        goto out;
                }
 
-               entry_ex->entry.keys.val[entry_ex->entry.keys.len] = key;
-               entry_ex->entry.keys.len++;
+               keys->val[keys->len] = key;
+               keys->len++;
        }
        ret = 0;
 out:
@@ -436,7 +436,7 @@ static int samba_kdc_set_random_keys(krb5_context context,
        return samba_kdc_set_fixed_keys(context, kdc_db_ctx,
                                        &secret_val,
                                        is_protected,
-                                       entry_ex);
+                                       &entry_ex->entry.keys);
 }
 
 
@@ -3229,4 +3229,4 @@ NTSTATUS samba_kdc_setup_db_ctx(TALLOC_CTX *mem_ctx, struct samba_kdc_base_conte
        }
        *kdc_db_ctx_out = kdc_db_ctx;
        return NT_STATUS_OK;
-}
\ No newline at end of file
+}

diff --git a/source4/kdc/db-glue.h b/source4/kdc/db-glue.h
index ad1015171a915a8546c56708c71c83652fb5b5cd..99a7531a8c606bfad14dfc912577967a10e0b72e 100644 (file)
--- a/source4/kdc/db-glue.h
+++ b/source4/kdc/db-glue.h
@@ -21,6 +21,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+struct sdb_keys;
 struct sdb_entry_ex;
 
 
@@ -28,7 +29,7 @@ int samba_kdc_set_fixed_keys(krb5_context context,
                             struct samba_kdc_db_context *kdc_db_ctx,
                             const struct ldb_val *secretbuffer,
                             bool is_protected,
-                            struct sdb_entry_ex *entry_ex);
+                            struct sdb_keys *keys);
 
 krb5_error_code samba_kdc_fetch(krb5_context context,
                                struct samba_kdc_db_context *kdc_db_ctx,

diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index 0c903afe35ce758b35f2d6964d6f5b26c4efd4fd..f7167823ee4a93e388331d13c6e9715d9c48c8a3 100644 (file)
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -223,8 +223,8 @@ static krb5_error_code hdb_samba4_fetch_fast_cookie(krb5_context context,
                return ret;
        }
 
-       ret = samba_kdc_set_fixed_keys(context, kdc_db_ctx,
-                                      val, false, &sdb_entry_ex);
+       ret = samba_kdc_set_fixed_keys(context, kdc_db_ctx, val, false,
+                                      &sdb_entry_ex.entry.keys);
        if (ret != 0) {
                return ret;
        }