s4:kdc: Remove unused flags

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 997a03d0ac1d3ee5b3ab34e001d4c93f5d2f2661..7d7fba2dc46bef72dad3c60c2aefb64ee8ca62ea 100644 (file)
--- a/source4/kdc/mit_samba.c
+++ b/source4/kdc/mit_samba.c
@@ -606,7 +606,7 @@ krb5_error_code mit_samba_update_pac(struct mit_samba_context *ctx,
        struct samba_kdc_entry *krbtgt_skdc_entry = NULL;
        bool is_in_db = false;
        bool is_trusted = false;
-       uint32_t flags = SAMBA_KDC_FLAG_SKIP_PAC_BUFFER;
+       uint32_t flags = 0;
 
        /* Create a memory context early so code can use talloc_stackframe() */
        tmp_ctx = talloc_named(ctx, 0, "mit_samba_update_pac context");
@@ -656,11 +656,6 @@ krb5_error_code mit_samba_update_pac(struct mit_samba_context *ctx,
                flags |=  SAMBA_KDC_FLAG_KRBTGT_IS_TRUSTED;
        }
 
-       if (is_in_db) {
-               flags |= SAMBA_KDC_FLAG_KRBTGT_IN_DB;
-
-       }
-
        if (kdc_flags & KRB5_KDB_FLAG_PROTOCOL_TRANSITION) {
                flags |= SAMBA_KDC_FLAG_PROTOCOL_TRANSITION;
        }

diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h
index 06bf69433dab2d4023a02553a85019aac7602205..9ff4574778cc7edb5d6c8a18fd3849d50f2928b5 100644 (file)
--- a/source4/kdc/pac-glue.h
+++ b/source4/kdc/pac-glue.h
@@ -51,9 +51,7 @@ enum samba_compounded_auth {
 enum {
        SAMBA_KDC_FLAG_PROTOCOL_TRANSITION    = 0x00000001,
        SAMBA_KDC_FLAG_CONSTRAINED_DELEGATION = 0x00000002,
-       SAMBA_KDC_FLAG_KRBTGT_IN_DB           = 0x00000004,
        SAMBA_KDC_FLAG_KRBTGT_IS_TRUSTED      = 0x00000008,
-       SAMBA_KDC_FLAG_SKIP_PAC_BUFFER        = 0x00000010,
        SAMBA_KDC_FLAG_DEVICE_KRBTGT_IS_TRUSTED = 0x00000020,
        SAMBA_KDC_FLAG_DELEGATED_PROXY_IS_TRUSTED = 0x00000040,
 };

diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c
index 96d67e639f4e310042ba5d61422fbc919b6425b3..b4b1382798c3a46e385e9cc0c7bb8c2807f87cb0 100644 (file)
--- a/source4/kdc/wdc-samba4.c
+++ b/source4/kdc/wdc-samba4.c
@@ -378,10 +378,6 @@ static krb5_error_code samba_wdc_verify_pac2(astgs_request_t r,
                flags |= SAMBA_KDC_FLAG_KRBTGT_IS_TRUSTED;
        }
 
-       if (is_in_db) {
-               flags |= SAMBA_KDC_FLAG_KRBTGT_IN_DB;
-       }
-
        ret = samba_kdc_verify_pac(mem_ctx,
                                   context,
                                   flags,