s4:kdc: Remove ‘claims_valid’ parameter from samba_kdc_get_user_info_dc()

It was not used.

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

diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c
index 71560b298fc94e6ca109f8a78ee775a819c225dc..cb65b20f3537dca903d3e798ec7e863b8d02e1a3 100644 (file)
--- a/source4/kdc/mit_samba.c
+++ b/source4/kdc/mit_samba.c
@@ -487,7 +487,6 @@ krb5_error_code mit_samba_get_pac(struct mit_samba_context *smb_ctx,
        nt_status = samba_kdc_get_user_info_dc(tmp_ctx,
                                               skdc_entry,
                                               asserted_identity,
-                                              SAMBA_CLAIMS_VALID_EXCLUDE,
                                               &user_info_dc);
        if (!NT_STATUS_IS_OK(nt_status)) {
                talloc_free(tmp_ctx);

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index 645c0039c52b712596b827727ae058cccde96771..80470f3eeff0c4a47b6a8e718756b18810a94e5c 100644 (file)
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -1099,7 +1099,6 @@ NTSTATUS samba_kdc_get_claims_blob(TALLOC_CTX *mem_ctx,
 NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx,
                                    struct samba_kdc_entry *skdc_entry,
                                    enum samba_asserted_identity asserted_identity,
-                                   enum samba_claims_valid claims_valid,
                                    struct auth_user_info_dc **user_info_dc_out)
 {
        NTSTATUS nt_status;
@@ -1130,14 +1129,6 @@ NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx,
                return nt_status;
        }
 
-       nt_status = samba_kdc_add_claims_valid(claims_valid,
-                                              user_info_dc);
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               DBG_ERR("Failed to add Claims Valid: %s\n",
-                       nt_errstr(nt_status));
-               return nt_status;
-       }
-
        *user_info_dc_out = user_info_dc;
 
        return NT_STATUS_OK;
@@ -1225,7 +1216,6 @@ static krb5_error_code samba_kdc_obtain_user_info_dc(TALLOC_CTX *mem_ctx,
                nt_status = samba_kdc_get_user_info_dc(mem_ctx,
                                                       skdc_entry,
                                                       SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY,
-                                                      SAMBA_CLAIMS_VALID_EXCLUDE,
                                                       &user_info_dc);
                if (!NT_STATUS_IS_OK(nt_status)) {
                        DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n",
@@ -2027,7 +2017,6 @@ static krb5_error_code samba_kdc_get_device_info_blob(TALLOC_CTX *mem_ctx,
        nt_status = samba_kdc_get_user_info_dc(frame,
                                               device,
                                               SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY,
-                                              SAMBA_CLAIMS_VALID_EXCLUDE,
                                               &device_info_dc);
        if (!NT_STATUS_IS_OK(nt_status)) {
                DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n",
@@ -2936,7 +2925,6 @@ krb5_error_code samba_kdc_check_device(TALLOC_CTX *mem_ctx,
                nt_status = samba_kdc_get_user_info_dc(frame,
                                                       device,
                                                       SAMBA_ASSERTED_IDENTITY_AUTHENTICATION_AUTHORITY,
-                                                      SAMBA_CLAIMS_VALID_EXCLUDE,
                                                       &device_info);
                if (!NT_STATUS_IS_OK(nt_status)) {
                        DBG_ERR("samba_kdc_get_user_info_dc failed: %s\n",

diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h
index f7cf0b5c30aa885ff9d4f2b55e49da5048ee73ab..7fe7f050ac6d681d749d1805891d61cc4e8298f7 100644 (file)
--- a/source4/kdc/pac-glue.h
+++ b/source4/kdc/pac-glue.h
@@ -87,7 +87,6 @@ NTSTATUS samba_kdc_get_user_info_from_db(struct samba_kdc_entry *skdc_entry,
 NTSTATUS samba_kdc_get_user_info_dc(TALLOC_CTX *mem_ctx,
                                    struct samba_kdc_entry *skdc_entry,
                                    enum samba_asserted_identity asserted_identity,
-                                   enum samba_claims_valid claims_valid,
                                    struct auth_user_info_dc **user_info_dc_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 c9e1d3fdb8978107be24b2a4672a882a45a75e1d..e0028b1822260115551b9664992f982829d76671 100644 (file)
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -126,7 +126,6 @@ static krb5_error_code samba_wdc_get_pac(void *priv,
        nt_status = samba_kdc_get_user_info_dc(mem_ctx,
                                               skdc_entry,
                                               asserted_identity,
-                                              SAMBA_CLAIMS_VALID_EXCLUDE,
                                               &user_info_dc);
        if (!NT_STATUS_IS_OK(nt_status)) {
                talloc_free(mem_ctx);