diff options
| author | Gerald W. Carter <jerry@samba.org> | 2008-04-17 18:11:22 +0200 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-17 18:11:22 +0200 |
| commit | 5c29bc8931d025de4ec91247be04da4388642727 (patch) | |
| tree | 0345ca3ba451dfdbe2f2bb48745299fe306e6d3f /source3/utils | |
| parent | 20104eef70ea1e2a64acb762ade2b4d64af0ee57 (diff) | |
| parent | d4d706e0fa6ed2c6b8cd1d788257c7bd096a170b (diff) | |
| download | samba-5c29bc8931d025de4ec91247be04da4388642727.tar.gz samba-5c29bc8931d025de4ec91247be04da4388642727.tar.bz2 samba-5c29bc8931d025de4ec91247be04da4388642727.zip | |
Merge commit 'samba/v3-2-test' into wbc-test
(This used to be commit 7c2e735df3d8a4105a4944411d111fc66c13b01f)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_rpc_samsync.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c index 986499731a..06cde2a3fd 100644 --- a/source3/utils/net_rpc_samsync.c +++ b/source3/utils/net_rpc_samsync.c @@ -1028,7 +1028,6 @@ static NTSTATUS fetch_domain_info(uint32_t rid, struct netr_DELTA_DOMAIN *r) { time_t u_max_age, u_min_age, u_logout; - time_t u_lockoutreset, u_lockouttime; NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL; const char *domname; struct netr_AcctLockStr *lockstr = NULL; @@ -1046,11 +1045,6 @@ static NTSTATUS fetch_domain_info(uint32_t rid, u_min_age = uint64s_nt_time_to_unix_abs((uint64 *)&r->min_password_age); u_logout = uint64s_nt_time_to_unix_abs((uint64 *)&r->force_logoff_time); - if (lockstr) { - u_lockoutreset = uint64s_nt_time_to_unix_abs(&lockstr->reset_count); - u_lockouttime = uint64s_nt_time_to_unix_abs((uint64_t *)&lockstr->lockout_duration); - } - domname = r->domain_name.string; if (!domname) { return NT_STATUS_NO_MEMORY; @@ -1081,6 +1075,11 @@ static NTSTATUS fetch_domain_info(uint32_t rid, return nt_status; if (lockstr) { + time_t u_lockoutreset, u_lockouttime; + + u_lockoutreset = uint64s_nt_time_to_unix_abs(&lockstr->reset_count); + u_lockouttime = uint64s_nt_time_to_unix_abs((uint64_t *)&lockstr->lockout_duration); + if (!pdb_set_account_policy(AP_BAD_ATTEMPT_LOCKOUT, lockstr->bad_attempt_lockout)) return nt_status; |