[SCM] Samba Shared Repository - branch v3-6-test updated

[Andreas Schneider]

The branch, v3-6-test has been updated
       via  b561963 s3-auth: Fixed account lockout check. (cherry picked from commit ad6560564350616b2925d097460876bd56555acf)
      from  a0f277f s3-rpc_client: Fixed status check of dcerpc_lsa_lookup_sids_noalloc.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit b561963883e825e1d7e43ebd45cbb6a4a666d2e6
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jan 17 12:53:40 2011 +0100

    s3-auth: Fixed account lockout check.
    (cherry picked from commit ad6560564350616b2925d097460876bd56555acf)

-----------------------------------------------------------------------

Summary of changes:
 source3/passdb/pdb_interface.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 1361c17..b48f409 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -235,7 +235,7 @@ static bool pdb_try_account_unlock(struct samu *sampass)
 {
 	uint32_t acb_info = pdb_get_acct_ctrl(sampass);
 
-	if (acb_info & (ACB_NORMAL|ACB_AUTOLOCK)) {
+	if ((acb_info & ACB_NORMAL) && (acb_info & ACB_AUTOLOCK)) {
 		uint32_t lockout_duration;
 		time_t bad_password_time;
 		time_t now = time(NULL);


-- 
Samba Shared Repository