s4:kdc: Pass ‘samdb’ into samba_kdc_get_user_info_from_db()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 6cb16a6239a4a494de8ca81267e8b29493a75952..a56915ae8b4b58ffba6a62e5488aa39c28a4f7c8 100644 (file)
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -1485,6 +1485,7 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
                 * they may fail to authenticate.
                 */
                ret = samba_kdc_get_user_info_from_db(tmp_ctx,
+                                                     kdc_db_ctx->samdb,
                                                      p,
                                                      msg,
                                                      &user_info_dc);

diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c
index 98ae9bc722888409da3e9801e5dad8e37667aafd..4b33bb9f412313937dc49b833a30ef4bfa219f13 100644 (file)
--- a/source4/kdc/mit_samba.c
+++ b/source4/kdc/mit_samba.c
@@ -485,6 +485,7 @@ krb5_error_code mit_samba_get_pac(struct mit_samba_context *smb_ctx,
        }
 
        code = samba_kdc_get_user_info_from_db(tmp_ctx,
+                                              server_entry->kdc_db_ctx->samdb,
                                               skdc_entry,
                                               skdc_entry->msg,
                                               &user_info_dc);
@@ -915,6 +916,7 @@ krb5_error_code mit_samba_kpasswd_change_password(struct mit_samba_context *ctx,
        }
 
        code = samba_kdc_get_user_info_from_db(tmp_ctx,
+                                              ctx->db_ctx->samdb,
                                               p,
                                               p->msg,
                                               &user_info_dc);

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 5b1f3c6a055943b8fbe4db0b836f188709db979b..b47912a29c36b3da559730c50d8918fbd2fbcd33 100644 (file)
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -1119,6 +1119,7 @@ NTSTATUS samba_kdc_get_claims_blob(TALLOC_CTX *mem_ctx,
 }
 
 krb5_error_code samba_kdc_get_user_info_from_db(TALLOC_CTX *mem_ctx,
+                                               struct ldb_context *samdb,
                                                struct samba_kdc_entry *entry,
                                                const struct ldb_message *msg,
                                                struct auth_user_info_dc **info_out)
@@ -1130,7 +1131,7 @@ krb5_error_code samba_kdc_get_user_info_from_db(TALLOC_CTX *mem_ctx,
                struct loadparm_context *lp_ctx = entry->kdc_db_ctx->lp_ctx;
 
                nt_status = authsam_make_user_info_dc(entry,
-                                                     entry->kdc_db_ctx->samdb,
+                                                     samdb,
                                                      lpcfg_netbios_name(lp_ctx),
                                                      lpcfg_sam_name(lp_ctx),
                                                      lpcfg_sam_dnsname(lp_ctx),
@@ -1238,6 +1239,7 @@ static krb5_error_code samba_kdc_obtain_user_info_dc(TALLOC_CTX *mem_ctx,
                 * here.
                 */
                ret = samba_kdc_get_user_info_from_db(mem_ctx,
+                                                     samdb,
                                                      entry.entry,
                                                      entry.entry->msg,
                                                      &user_info_dc);
@@ -2052,6 +2054,7 @@ static krb5_error_code samba_kdc_get_device_info_blob(TALLOC_CTX *mem_ctx,
        frame = talloc_stackframe();
 
        code = samba_kdc_get_user_info_from_db(frame,
+                                              samdb,
                                               device,
                                               device->msg,
                                               &device_info_dc);
@@ -2169,6 +2172,7 @@ krb5_error_code samba_kdc_verify_pac(TALLOC_CTX *mem_ctx,
                }
 
                code = samba_kdc_get_user_info_from_db(tmp_ctx,
+                                                      samdb,
                                                       client.entry,
                                                       client.entry->msg,
                                                       &user_info_dc);
@@ -2926,6 +2930,7 @@ krb5_error_code samba_kdc_check_device(TALLOC_CTX *mem_ctx,
                }
        } else {
                code = samba_kdc_get_user_info_from_db(frame,
+                                                      samdb,
                                                       device.entry,
                                                       device.entry->msg,
                                                       &device_info);

diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h
index 3b30e308e2ec23d97625b9085a4b249e8adaf9a5..ab039194f0bb3b5ef0de35333ecb0849aca09aa2 100644 (file)
--- a/source4/kdc/pac-glue.h
+++ b/source4/kdc/pac-glue.h
@@ -108,6 +108,7 @@ krb5_error_code samba_krbtgt_is_in_db(const struct samba_kdc_entry *skdc_entry,
                                      bool *is_trusted);
 
 krb5_error_code samba_kdc_get_user_info_from_db(TALLOC_CTX *mem_ctx,
+                                               struct ldb_context *samdb,
                                                struct samba_kdc_entry *entry,
                                                const struct ldb_message *msg,
                                                struct auth_user_info_dc **info_out);

diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index df560b941217131df3bd3f7e7e74f81a05cfe4d9..1a3faa2babc23381d6d2c90c4b7b6a5916e9ea39 100644 (file)
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -124,6 +124,7 @@ static krb5_error_code samba_wdc_get_pac(void *priv,
        }
 
        ret = samba_kdc_get_user_info_from_db(mem_ctx,
+                                             server_entry->kdc_db_ctx->samdb,
                                              skdc_entry,
                                              skdc_entry->msg,
                                              &user_info_dc);