s4:kdc: Rename samba_kdc_get_user_info_dc() to 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 4def9a9128f58900edbd5cdaa7c2143942f4a5bd..9fff0c3dac85402792bbe41acdf2891d049029a2 100644 (file)
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -1484,10 +1484,10 @@ static krb5_error_code samba_kdc_message2entry(krb5_context context,
                 * and computers should never be members of Protected Users, or
                 * they may fail to authenticate.
                 */
-               status = samba_kdc_get_user_info_dc(tmp_ctx,
-                                                   p,
-                                                   msg,
-                                                   &user_info_dc);
+               status = samba_kdc_get_user_info_from_db(tmp_ctx,
+                                                        p,
+                                                        msg,
+                                                        &user_info_dc);
                if (!NT_STATUS_IS_OK(status)) {
                        ret = EINVAL;
                        goto out;

diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c
index eb24ae8d02422b4fdf1e0c26c2bfbf244bad8deb..f22d6a385995d8aec174ccec17d87c1607336e95 100644 (file)
--- a/source4/kdc/mit_samba.c
+++ b/source4/kdc/mit_samba.c
@@ -484,10 +484,10 @@ krb5_error_code mit_samba_get_pac(struct mit_samba_context *smb_ctx,
                cred_ndr_ptr = &cred_ndr;
        }
 
-       nt_status = samba_kdc_get_user_info_dc(tmp_ctx,
-                                              skdc_entry,
-                                              skdc_entry->msg,
-                                              &user_info_dc);
+       nt_status = samba_kdc_get_user_info_from_db(tmp_ctx,
+                                                   skdc_entry,
+                                                   skdc_entry->msg,
+                                                   &user_info_dc);
        if (!NT_STATUS_IS_OK(nt_status)) {
                talloc_free(tmp_ctx);
                if (NT_STATUS_EQUAL(nt_status,
@@ -917,12 +917,12 @@ krb5_error_code mit_samba_kpasswd_change_password(struct mit_samba_context *ctx,
                return ENOMEM;
        }
 
-       status = samba_kdc_get_user_info_dc(tmp_ctx,
-                                           p,
-                                           p->msg,
-                                           &user_info_dc);
+       status = samba_kdc_get_user_info_from_db(tmp_ctx,
+                                                p,
+                                                p->msg,
+                                                &user_info_dc);
        if (!NT_STATUS_IS_OK(status)) {
-               DBG_WARNING("samba_kdc_get_user_info_dc failed: %s\n",
+               DBG_WARNING("samba_kdc_get_user_info_from_db failed: %s\n",
                            nt_errstr(status));
                code = EINVAL;
                goto out;

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 39cabfd94a73094d179825fa7a83c6386acea03f..3fd782adadcb04efbe27da298968def6cdb0ac4c 100644 (file)
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -1118,10 +1118,10 @@ NTSTATUS samba_kdc_get_claims_blob(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx,
-                                   struct samba_kdc_entry *entry,
-                                   const struct ldb_message *msg,
-                                   struct auth_user_info_dc **info_out)
+NTSTATUS samba_kdc_get_user_info_from_db(TALLOC_CTX *mem_ctx,
+                                        struct samba_kdc_entry *entry,
+                                        const struct ldb_message *msg,
+                                        struct auth_user_info_dc **info_out)
 {
        NTSTATUS nt_status;
        struct auth_user_info_dc *user_info_dc = NULL;
@@ -1236,12 +1236,12 @@ static krb5_error_code samba_kdc_obtain_user_info_dc(TALLOC_CTX *mem_ctx,
                 * SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY
                 * here.
                 */
-               nt_status = samba_kdc_get_user_info_dc(mem_ctx,
-                                                      entry.entry,
-                                                      entry.entry->msg,
-                                                      &user_info_dc);
+               nt_status = samba_kdc_get_user_info_from_db(mem_ctx,
+                                                           entry.entry,
+                                                           entry.entry->msg,
+                                                           &user_info_dc);
                if (!NT_STATUS_IS_OK(nt_status)) {
-                       DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n",
+                       DBG_ERR("samba_kdc_get_user_info_from_db failed: %s\n",
                                nt_errstr(nt_status));
                        ret = KRB5KDC_ERR_TGT_REVOKED;
                        goto out;
@@ -2045,12 +2045,12 @@ static krb5_error_code samba_kdc_get_device_info_blob(TALLOC_CTX *mem_ctx,
 
        frame = talloc_stackframe();
 
-       nt_status = samba_kdc_get_user_info_dc(frame,
-                                              device,
-                                              device->msg,
-                                              &device_info_dc);
+       nt_status = samba_kdc_get_user_info_from_db(frame,
+                                                   device,
+                                                   device->msg,
+                                                   &device_info_dc);
        if (!NT_STATUS_IS_OK(nt_status)) {
-               DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n",
+               DBG_ERR("samba_kdc_get_user_info_from_db failed: %s\n",
                        nt_errstr(nt_status));
                talloc_free(frame);
                return KRB5KDC_ERR_TGT_REVOKED;
@@ -2157,10 +2157,10 @@ krb5_error_code samba_kdc_verify_pac(TALLOC_CTX *mem_ctx,
                        goto done;
                }
 
-               nt_status = samba_kdc_get_user_info_dc(tmp_ctx,
-                                                      client.entry,
-                                                      client.entry->msg,
-                                                      &user_info_dc);
+               nt_status = samba_kdc_get_user_info_from_db(tmp_ctx,
+                                                           client.entry,
+                                                           client.entry->msg,
+                                                           &user_info_dc);
                if (!NT_STATUS_IS_OK(nt_status)) {
                        DBG_ERR("Getting user info for PAC failed: %s\n",
                                nt_errstr(nt_status));
@@ -2909,12 +2909,12 @@ krb5_error_code samba_kdc_check_device(TALLOC_CTX *mem_ctx,
                        goto out;
                }
        } else {
-               nt_status = samba_kdc_get_user_info_dc(frame,
-                                                      device.entry,
-                                                      device.entry->msg,
-                                                      &device_info);
+               nt_status = samba_kdc_get_user_info_from_db(frame,
+                                                           device.entry,
+                                                           device.entry->msg,
+                                                           &device_info);
                if (!NT_STATUS_IS_OK(nt_status)) {
-                       DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n",
+                       DBG_ERR("samba_kdc_get_user_info_from_db failed: %s\n",
                                nt_errstr(nt_status));
 
                        code = KRB5KDC_ERR_TGT_REVOKED;

diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h
index 4db38caf6096f51f3f0f032ebad66f116dfab7a3..64895483aaa890403fad9b89ac482c2eb72de0ec 100644 (file)
--- a/source4/kdc/pac-glue.h
+++ b/source4/kdc/pac-glue.h
@@ -107,10 +107,10 @@ 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_dc(TALLOC_CTX *mem_ctx,
-                                   struct samba_kdc_entry *entry,
-                                   const struct ldb_message *msg,
-                                   struct auth_user_info_dc **info_out);
+NTSTATUS samba_kdc_get_user_info_from_db(TALLOC_CTX *mem_ctx,
+                                        struct samba_kdc_entry *entry,
+                                        const struct ldb_message *msg,
+                                        struct auth_user_info_dc **info_out);
 
 krb5_error_code samba_kdc_map_policy_err(NTSTATUS nt_status);
 

diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index 3546b32f18ffce45b06c17b482656eb7f1dcfca5..0bece0b065e3032d66490ee780c824f3c61d5506 100644 (file)
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -123,10 +123,10 @@ static krb5_error_code samba_wdc_get_pac(void *priv,
                cred_ndr_ptr = &cred_ndr;
        }
 
-       nt_status = samba_kdc_get_user_info_dc(mem_ctx,
-                                              skdc_entry,
-                                              skdc_entry->msg,
-                                              &user_info_dc);
+       nt_status = samba_kdc_get_user_info_from_db(mem_ctx,
+                                                   skdc_entry,
+                                                   skdc_entry->msg,
+                                                   &user_info_dc);
        if (!NT_STATUS_IS_OK(nt_status)) {
                talloc_free(mem_ctx);
                return map_errno_from_nt_status(nt_status);