diff options
| author | Jeremy Allison <jra@samba.org> | 2008-02-05 18:13:33 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-02-05 18:13:33 -0800 |
| commit | b3f48266f353fb93fee35bdcadaec3abc0fe0122 (patch) | |
| tree | c881e089db81ac6e6faa76e09952c7ad2015ea4a /source3/winbindd/winbindd_passdb.c | |
| parent | 8b3004bcf90587d038f18b31b0133da4b0ad5fc9 (diff) | |
| parent | d3311c5c506af7092ba222cdae7834d7e56ec942 (diff) | |
| download | samba-b3f48266f353fb93fee35bdcadaec3abc0fe0122.tar.gz samba-b3f48266f353fb93fee35bdcadaec3abc0fe0122.tar.bz2 samba-b3f48266f353fb93fee35bdcadaec3abc0fe0122.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 7b15c75a6bacf783eb73568ed003e4b16d6ebd68)
Diffstat (limited to 'source3/winbindd/winbindd_passdb.c')
| -rw-r--r-- | source3/winbindd/winbindd_passdb.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source3/winbindd/winbindd_passdb.c b/source3/winbindd/winbindd_passdb.c index 29db8be857..7c1d7bd71b 100644 --- a/source3/winbindd/winbindd_passdb.c +++ b/source3/winbindd/winbindd_passdb.c @@ -338,7 +338,7 @@ static NTSTATUS sequence_number(struct winbindd_domain *domain, uint32 *seq) static NTSTATUS lockout_policy(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - SAM_UNK_INFO_12 *policy) + struct samr_DomInfo12 *policy) { /* actually we have that */ return NT_STATUS_NOT_IMPLEMENTED; @@ -346,14 +346,14 @@ static NTSTATUS lockout_policy(struct winbindd_domain *domain, static NTSTATUS password_policy(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - SAM_UNK_INFO_1 *policy) + struct samr_DomInfo1 *policy) { uint32 min_pass_len,pass_hist,password_properties; time_t u_expire, u_min_age; NTTIME nt_expire, nt_min_age; uint32 account_policy_temp; - if ((policy = TALLOC_ZERO_P(mem_ctx, SAM_UNK_INFO_1)) == NULL) { + if ((policy = TALLOC_ZERO_P(mem_ctx, struct samr_DomInfo1)) == NULL) { return NT_STATUS_NO_MEMORY; } @@ -385,8 +385,12 @@ static NTSTATUS password_policy(struct winbindd_domain *domain, unix_to_nt_time_abs(&nt_expire, u_expire); unix_to_nt_time_abs(&nt_min_age, u_min_age); - init_unk_info1(policy, (uint16)min_pass_len, (uint16)pass_hist, - password_properties, nt_expire, nt_min_age); + init_samr_DomInfo1(policy, + (uint16)min_pass_len, + (uint16)pass_hist, + password_properties, + nt_expire, + nt_min_age); return NT_STATUS_OK; } |