s4:kdc: samba_kdc_{first,next}key() only need sdb_entry

sdb_entry_ex will be removed shortly.

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 b6f92aafe8dc2e278405f1dc39767dcc45fc5e27..e8375cc9252fc0fd3a5e785ad843c2c90993ce3b 100644 (file)
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -2593,9 +2593,8 @@ out:
 
 krb5_error_code samba_kdc_firstkey(krb5_context context,
                                   struct samba_kdc_db_context *kdc_db_ctx,
-                                  struct sdb_entry_ex *entry_ex)
+                                  struct sdb_entry *entry)
 {
-       struct sdb_entry *entry = &entry_ex->entry;
        struct ldb_context *ldb_ctx = kdc_db_ctx->samdb;
        struct samba_kdc_seq *priv = kdc_db_ctx->seq_ctx;
        char *realm;
@@ -2665,9 +2664,8 @@ krb5_error_code samba_kdc_firstkey(krb5_context context,
 
 krb5_error_code samba_kdc_nextkey(krb5_context context,
                                  struct samba_kdc_db_context *kdc_db_ctx,
-                                 struct sdb_entry_ex *entry_ex)
+                                 struct sdb_entry *entry)
 {
-       struct sdb_entry *entry = &entry_ex->entry;
        return samba_kdc_seq(context, kdc_db_ctx, entry);
 }
 

diff --git a/source4/kdc/db-glue.h b/source4/kdc/db-glue.h
index dc4e177e5abe72327aa0bbe2652f7c2f20595c86..d9559d395f1779cde673369ef169e851b2e2b0d4 100644 (file)
--- a/source4/kdc/db-glue.h
+++ b/source4/kdc/db-glue.h
@@ -23,7 +23,6 @@
 
 struct sdb_keys;
 struct sdb_entry;
-struct sdb_entry_ex;
 
 
 int samba_kdc_set_fixed_keys(krb5_context context,
@@ -41,11 +40,11 @@ krb5_error_code samba_kdc_fetch(krb5_context context,
 
 krb5_error_code samba_kdc_firstkey(krb5_context context,
                                   struct samba_kdc_db_context *kdc_db_ctx,
-                                  struct sdb_entry_ex *entry);
+                                  struct sdb_entry *entry);
 
 krb5_error_code samba_kdc_nextkey(krb5_context context,
                                  struct samba_kdc_db_context *kdc_db_ctx,
-                                 struct sdb_entry_ex *entry);
+                                 struct sdb_entry *entry);
 
 krb5_error_code
 samba_kdc_check_client_matches_target_service(krb5_context context,

diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index a57f00a32da5b7d87f928314c1d429336486e7e8..d10515c2edcd3ea3f5262acd761fd31e2a9d794c 100644 (file)
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -303,7 +303,7 @@ static krb5_error_code hdb_samba4_firstkey(krb5_context context, HDB *db, unsign
        kdc_db_ctx = talloc_get_type_abort(db->hdb_db,
                                           struct samba_kdc_db_context);
 
-       ret = samba_kdc_firstkey(context, kdc_db_ctx, &sdb_entry_ex);
+       ret = samba_kdc_firstkey(context, kdc_db_ctx, &sdb_entry_ex.entry);
        switch (ret) {
        case 0:
                break;
@@ -332,7 +332,7 @@ static krb5_error_code hdb_samba4_nextkey(krb5_context context, HDB *db, unsigne
        kdc_db_ctx = talloc_get_type_abort(db->hdb_db,
                                           struct samba_kdc_db_context);
 
-       ret = samba_kdc_nextkey(context, kdc_db_ctx, &sdb_entry_ex);
+       ret = samba_kdc_nextkey(context, kdc_db_ctx, &sdb_entry_ex.entry);
        switch (ret) {
        case 0:
                break;

diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c
index 5fe6f26f143d206245a717a3885602f7da2261f9..ca64ec6d84d326ff876acd5294dadc65a4fc582a 100644 (file)
--- a/source4/kdc/mit_samba.c
+++ b/source4/kdc/mit_samba.c
@@ -396,7 +396,7 @@ int mit_samba_get_firstkey(struct mit_samba_context *ctx,
                return ENOMEM;
        }
 
-       ret = samba_kdc_firstkey(ctx->context, ctx->db_ctx, &sentry);
+       ret = samba_kdc_firstkey(ctx->context, ctx->db_ctx, &sentry.entry);
        switch (ret) {
        case 0:
                break;
@@ -434,7 +434,7 @@ int mit_samba_get_nextkey(struct mit_samba_context *ctx,
                return ENOMEM;
        }
 
-       ret = samba_kdc_nextkey(ctx->context, ctx->db_ctx, &sentry);
+       ret = samba_kdc_nextkey(ctx->context, ctx->db_ctx, &sentry.entry);
        switch (ret) {
        case 0:
                break;

diff --git a/source4/libnet/libnet_export_keytab.c b/source4/libnet/libnet_export_keytab.c
index c42922cdc79d967dbe132b0a88418394f9acaadb..3e6f8cbe301bb9340682f1ad677697edbb29b0cd 100644 (file)
--- a/source4/libnet/libnet_export_keytab.c
+++ b/source4/libnet/libnet_export_keytab.c
@@ -72,10 +72,10 @@ static NTSTATUS sdb_kt_copy(TALLOC_CTX *mem_ctx,
 
                krb5_free_principal(context, k5_princ);
        } else {
-               code = samba_kdc_firstkey(context, db_ctx, &sentry);
+               code = samba_kdc_firstkey(context, db_ctx, &sentry.entry);
        }
 
-       for (; code == 0; code = samba_kdc_nextkey(context, db_ctx, &sentry)) {
+       for (; code == 0; code = samba_kdc_nextkey(context, db_ctx, &sentry.entry)) {
                int i;
 
                code = krb5_unparse_name(context,