s4:kdc: samba_kdc_fetch() only needs 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 94e0c947bef67fb929d9ced078ef6cb155116c79..b6f92aafe8dc2e278405f1dc39767dcc45fc5e27 100644 (file)
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -2477,9 +2477,8 @@ krb5_error_code samba_kdc_fetch(krb5_context context,
                                krb5_const_principal principal,
                                unsigned flags,
                                krb5_kvno kvno,
-                               struct sdb_entry_ex *entry_ex)
+                               struct sdb_entry *entry)
 {
-       struct sdb_entry *entry = &entry_ex->entry;
        krb5_error_code ret = SDB_ERR_NOENTRY;
        TALLOC_CTX *mem_ctx;
 

diff --git a/source4/kdc/db-glue.h b/source4/kdc/db-glue.h
index 99a7531a8c606bfad14dfc912577967a10e0b72e..dc4e177e5abe72327aa0bbe2652f7c2f20595c86 100644 (file)
--- a/source4/kdc/db-glue.h
+++ b/source4/kdc/db-glue.h
@@ -22,6 +22,7 @@
 */
 
 struct sdb_keys;
+struct sdb_entry;
 struct sdb_entry_ex;
 
 
@@ -36,7 +37,7 @@ krb5_error_code samba_kdc_fetch(krb5_context context,
                                krb5_const_principal principal,
                                unsigned flags,
                                krb5_kvno kvno,
-                               struct sdb_entry_ex *entry_ex);
+                               struct sdb_entry *entry);
 
 krb5_error_code samba_kdc_firstkey(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 436bf079536284ffda713397de276c2132c30b79..a57f00a32da5b7d87f928314c1d429336486e7e8 100644 (file)
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -263,7 +263,7 @@ static krb5_error_code hdb_samba4_fetch_kvno(krb5_context context, HDB *db,
                              principal,
                              sflags,
                              kvno,
-                             &sdb_entry_ex);
+                             &sdb_entry_ex.entry);
        switch (ret) {
        case 0:
                code = 0;

diff --git a/source4/kdc/mit_kdc_irpc.c b/source4/kdc/mit_kdc_irpc.c
index 33eb74b37f54755f81c40ac3054a9e7612e6d8c4..cc5410d5a7217177471aeba73d66dac637164924 100644 (file)
--- a/source4/kdc/mit_kdc_irpc.c
+++ b/source4/kdc/mit_kdc_irpc.c
@@ -112,7 +112,7 @@ static NTSTATUS netr_samlogon_generic_logon(struct irpc_message *msg,
                               principal,
                               SDB_F_GET_KRBTGT | SDB_F_DECRYPT,
                               0,
-                              &sentry);
+                              &sentry.entry);
        krb5_free_principal(mki_ctx->krb5_context, principal);
        if (code != 0) {
                DEBUG(0, ("Failed to fetch krbtgt@%s principal entry!\n",

diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c
index faea8390ab0514468585c284d451c53b85ff8464..5fe6f26f143d206245a717a3885602f7da2261f9 100644 (file)
--- a/source4/kdc/mit_samba.c
+++ b/source4/kdc/mit_samba.c
@@ -289,7 +289,7 @@ int mit_samba_get_principal(struct mit_samba_context *ctx,
 
 fetch_referral_principal:
        ret = samba_kdc_fetch(ctx->context, ctx->db_ctx,
-                             principal, sflags, 0, &sentry);
+                             principal, sflags, 0, &sentry.entry);
        switch (ret) {
        case 0:
                break;

diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index b7e2c78a143b1a754714be75f81bc0f68f2d7a7e..e6292696aaf9f7abe462718f06b5dd7556586dd9 100644 (file)
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -336,7 +336,7 @@ static krb5_error_code samba_wdc_reget_pac(void *priv, astgs_request_t r,
                                                      krbtgt->principal,
                                                      SDB_F_GET_KRBTGT | SDB_F_CANON,
                                                      0,
-                                                     &signing_krbtgt_sdb);
+                                                     &signing_krbtgt_sdb.entry);
                                if (ret != 0) {
                                        return ret;
                                }

diff --git a/source4/libnet/libnet_export_keytab.c b/source4/libnet/libnet_export_keytab.c
index d9ef8919285b98b3dd627e4aa4dff5b640302282..c42922cdc79d967dbe132b0a88418394f9acaadb 100644 (file)
--- a/source4/libnet/libnet_export_keytab.c
+++ b/source4/libnet/libnet_export_keytab.c
@@ -68,7 +68,7 @@ static NTSTATUS sdb_kt_copy(TALLOC_CTX *mem_ctx,
 
                code = samba_kdc_fetch(context, db_ctx, k5_princ,
                                       SDB_F_GET_ANY | SDB_F_ADMIN_DATA,
-                                      0, &sentry);
+                                      0, &sentry.entry);
 
                krb5_free_principal(context, k5_princ);
        } else {