From 0ac464df4543154ee8a1cbf03684d8b99bcb92b3 Mon Sep 17 00:00:00 2001 From: Tim Beale Date: Thu, 19 Apr 2018 09:47:42 +1200 Subject: [PATCH] dsdb: Move anonymous domain_data struct Anonymous structs and 80 character line-lengths don't mix well. Allow the struct to be referenced directly. With the introduction of PSOs, the password-settings are now calculated per-user rather than per-domain. I've tried to reflect this in the struct name. Signed-off-by: Tim Beale Reviewed-by: Andrew Bartlett Reviewed-by: Garming Sam --- source4/dsdb/samdb/samdb.h | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h index 65d22ea0a58..28d1b5cb32f 100644 --- a/source4/dsdb/samdb/samdb.h +++ b/source4/dsdb/samdb/samdb.h @@ -76,18 +76,20 @@ struct dsdb_control_current_partition { #define DSDB_CONTROL_PASSWORD_CHANGE_STATUS_OID "1.3.6.1.4.1.7165.4.3.8" +struct dsdb_user_pwd_settings { + uint32_t pwdProperties; + uint32_t pwdHistoryLength; + int64_t maxPwdAge; + int64_t minPwdAge; + uint32_t minPwdLength; + bool store_cleartext; + const char *netbios_domain; + const char *dns_domain; + const char *realm; +}; + struct dsdb_control_password_change_status { - struct { - uint32_t pwdProperties; - uint32_t pwdHistoryLength; - int64_t maxPwdAge; - int64_t minPwdAge; - uint32_t minPwdLength; - bool store_cleartext; - const char *netbios_domain; - const char *dns_domain; - const char *realm; - } domain_data; + struct dsdb_user_pwd_settings domain_data; enum samPwdChangeReason reject_reason; }; -- 2.47.2