s4-kdc: Remove unused etypes from sdb structure

Signed-off-by: Andreas Schneider <asn@samba.org>
eviewed-by: Guenther Deschner <gd@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Mon Sep 26 06:08:09 CEST 2016 on sn-devel-144

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 14512c8e160ddd542bfc3a8bea9d71e623b0d3dc..ef750a806caff92436daf96089d7f7f117fd7e2e 100644 (file)
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -736,7 +736,6 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
        struct loadparm_context *lp_ctx = kdc_db_ctx->lp_ctx;
        uint32_t userAccountControl;
        uint32_t msDS_User_Account_Control_Computed;
-       unsigned int i;
        krb5_error_code ret = 0;
        krb5_boolean is_computer = FALSE;
 
@@ -1088,24 +1087,6 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
                goto out;
        }
 
-       entry_ex->entry.etypes = malloc(sizeof(*(entry_ex->entry.etypes)));
-       if (entry_ex->entry.etypes == NULL) {
-               krb5_clear_error_message(context);
-               ret = ENOMEM;
-               goto out;
-       }
-       entry_ex->entry.etypes->len = entry_ex->entry.keys.len;
-       entry_ex->entry.etypes->val = calloc(entry_ex->entry.etypes->len, sizeof(int));
-       if (entry_ex->entry.etypes->val == NULL) {
-               krb5_clear_error_message(context);
-               ret = ENOMEM;
-               goto out;
-       }
-       for (i=0; i < entry_ex->entry.etypes->len; i++) {
-               entry_ex->entry.etypes->val[i] = KRB5_KEY_TYPE(&entry_ex->entry.keys.val[i].key);
-       }
-
-
        p->msg = talloc_steal(p, msg);
 
 out:
@@ -1499,23 +1480,6 @@ static krb5_error_code samba_kdc_trust_message2entry(krb5_context context,
                goto out;
        }
 
-       entry_ex->entry.etypes = malloc(sizeof(*(entry_ex->entry.etypes)));
-       if (entry_ex->entry.etypes == NULL) {
-               krb5_clear_error_message(context);
-               ret = ENOMEM;
-               goto out;
-       }
-       entry_ex->entry.etypes->len = entry_ex->entry.keys.len;
-       entry_ex->entry.etypes->val = calloc(entry_ex->entry.etypes->len, sizeof(int));
-       if (entry_ex->entry.etypes->val == NULL) {
-               krb5_clear_error_message(context);
-               ret = ENOMEM;
-               goto out;
-       }
-       for (i=0; i < entry_ex->entry.etypes->len; i++) {
-               entry_ex->entry.etypes->val[i] = KRB5_KEY_TYPE(&entry_ex->entry.keys.val[i].key);
-       }
-
        p->msg = talloc_steal(p, msg);
 
 out:

diff --git a/source4/kdc/sdb.c b/source4/kdc/sdb.c
index ca6b38d1a3230838319a7ce40eeec191d1dbb9ea..2150150505b831031a44acc96f89ff69e4e8a6e0 100644 (file)
--- a/source4/kdc/sdb.c
+++ b/source4/kdc/sdb.c
@@ -92,12 +92,6 @@ void free_sdb_entry(struct sdb_entry *s)
        SAFE_FREE(s->valid_start);
        SAFE_FREE(s->valid_end);
        SAFE_FREE(s->pw_end);
-       if (s->etypes) {
-               if (s->etypes->len) {
-                       free(s->etypes->val);
-               }
-               free(s->etypes);
-       }
 
        ZERO_STRUCTP(s);
 }

diff --git a/source4/kdc/sdb.h b/source4/kdc/sdb.h
index e4f2725498c0a182b50c213c24d94f64feded48d..dbebb26ad0b7c6f6cb0dff6603be273cbd0987a4 100644 (file)
--- a/source4/kdc/sdb.h
+++ b/source4/kdc/sdb.h
@@ -92,10 +92,6 @@ struct sdb_entry {
        unsigned int *max_life;
        unsigned int *max_renew;
        struct SDBFlags flags;
-       struct sdb_entry_etypes {
-               unsigned int len;
-               unsigned int *val;
-       } *etypes;
 };
 
 struct sdb_entry_ex {