s4:kdc: Rename ‘skdc_entry’ parameter of samba_kdc_get_user_info_from_db() to ‘entry’

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

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 279f4dc139777ff4074340208815742badcf07e3..304da12125e26ea6a5518333cbed9cd80fe55ed3 100644 (file)
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -913,30 +913,30 @@ static bool samba_kdc_entry_pac_issued_by_trust(const struct samba_kdc_entry_pac
  * structure. If the resulting structure is not talloc_free()d, it will be
  * reused on future calls to this function.
  */
-NTSTATUS samba_kdc_get_user_info_from_db(struct samba_kdc_entry *skdc_entry,
+NTSTATUS samba_kdc_get_user_info_from_db(struct samba_kdc_entry *entry,
                                          const struct ldb_message *msg,
                                          const struct auth_user_info_dc **user_info_dc)
 {
-       if (skdc_entry->user_info_dc == NULL) {
+       if (entry->user_info_dc == NULL) {
                NTSTATUS nt_status;
-               struct loadparm_context *lp_ctx = skdc_entry->kdc_db_ctx->lp_ctx;
+               struct loadparm_context *lp_ctx = entry->kdc_db_ctx->lp_ctx;
 
-               nt_status = authsam_make_user_info_dc(skdc_entry,
-                                                     skdc_entry->kdc_db_ctx->samdb,
+               nt_status = authsam_make_user_info_dc(entry,
+                                                     entry->kdc_db_ctx->samdb,
                                                      lpcfg_netbios_name(lp_ctx),
                                                      lpcfg_sam_name(lp_ctx),
                                                      lpcfg_sam_dnsname(lp_ctx),
-                                                     skdc_entry->realm_dn,
+                                                     entry->realm_dn,
                                                      msg,
                                                      data_blob_null,
                                                      data_blob_null,
-                                                     &skdc_entry->user_info_dc);
+                                                     &entry->user_info_dc);
                if (!NT_STATUS_IS_OK(nt_status)) {
                        return nt_status;
                }
        }
 
-       *user_info_dc = skdc_entry->user_info_dc;
+       *user_info_dc = entry->user_info_dc;
        return NT_STATUS_OK;
 }
 

diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h
index b4592b4240ab6679351ae4b90a9d05edf4f13cb8..1b24a8cb05b85782a5cfd90d77c0a1637267c7bc 100644 (file)
--- a/source4/kdc/pac-glue.h
+++ b/source4/kdc/pac-glue.h
@@ -107,7 +107,7 @@ krb5_error_code samba_krbtgt_is_in_db(const struct samba_kdc_entry *skdc_entry,
                                      bool *is_in_db,
                                      bool *is_trusted);
 
-NTSTATUS samba_kdc_get_user_info_from_db(struct samba_kdc_entry *skdc_entry,
+NTSTATUS samba_kdc_get_user_info_from_db(struct samba_kdc_entry *entry,
                                         const struct ldb_message *msg,
                                         const struct auth_user_info_dc **user_info_dc);