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 <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h
index 65d22ea0a58c20e4b24feaf3a9ff44dcb3421ba5..28d1b5cb32fa6acac94d1a5a1e80469ac5ec250b 100644 (file)
--- 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;
 };