summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorTim Beale <timbeale@catalyst.net.nz>2018-04-19 09:47:42 +1200
committerGarming Sam <garming@samba.org>2018-05-23 06:55:31 +0200
commit0ac464df4543154ee8a1cbf03684d8b99bcb92b3 (patch)
treedd75e5cef656b5b9fa7b33bed60b74f6e69ca1d0 /source4
parente40af276f8d0eb8fd7e38094101b1874177ea6b0 (diff)
downloadsamba-0ac464df4543154ee8a1cbf03684d8b99bcb92b3.tar.gz
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>
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/samdb.h24
1 files 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;
};