git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
db708d4
)
Fix gcc uninitialized variable used warning.
author
Jeremy Allison
<jra@samba.org>
Thu, 17 Apr 2008 15:02:46 +0000
(08:02 -0700)
committer
Jeremy Allison
<jra@samba.org>
Thu, 17 Apr 2008 15:02:46 +0000
(08:02 -0700)
Jeremy.
source/utils/net_rpc_samsync.c
patch
|
blob
|
history
diff --git
a/source/utils/net_rpc_samsync.c
b/source/utils/net_rpc_samsync.c
index 986499731af6de8fec4e0b0eb8e3265ec2cc0d46..06cde2a3fdbed54058b1e4ebfefba4010af94ffe 100644
(file)
--- a/
source/utils/net_rpc_samsync.c
+++ b/
source/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;
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;
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);
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;
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) {
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;
if (!pdb_set_account_policy(AP_BAD_ATTEMPT_LOCKOUT,
lockstr->bad_attempt_lockout))
return nt_status;