s4:dsdb: Remove redundant user flags macro

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

diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 4e9ece53643410783537ae865e9eabe8ee05ea68..e71728da8bcdabe6fe4ef5b0fedce32cf533661f 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -700,15 +700,10 @@ static int construct_msds_keyversionnumber(struct ldb_module *module,
 
 }
 
-#define _UF_TRUST_ACCOUNTS ( \
-       UF_WORKSTATION_TRUST_ACCOUNT | \
-       UF_SERVER_TRUST_ACCOUNT | \
-       UF_INTERDOMAIN_TRUST_ACCOUNT \
-)
 #define _UF_NO_EXPIRY_ACCOUNTS ( \
        UF_SMARTCARD_REQUIRED | \
        UF_DONT_EXPIRE_PASSWD | \
-       _UF_TRUST_ACCOUNTS \
+       UF_TRUST_ACCOUNT_MASK \
 )
 
 
@@ -887,7 +882,7 @@ static int construct_msds_user_account_control_computed(struct ldb_module *modul
        userAccountControl = ldb_msg_find_attr_as_uint(msg,
                                                       "userAccountControl",
                                                       0);
-       if (!(userAccountControl & _UF_TRUST_ACCOUNTS)) {
+       if (!(userAccountControl & UF_TRUST_ACCOUNT_MASK)) {
 
                int64_t lockoutTime = ldb_msg_find_attr_as_int64(msg, "lockoutTime", 0);
                if (lockoutTime != 0) {