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

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  c5b7912 s3-winbind: BUG 8166 - Don't lockout users when offline.
      from  4361092 s3: Safely mark our sconn as smb2 if we have that protocol

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


- Log -----------------------------------------------------------------
commit c5b79122d9ea3945df721cb364249c5c33f35b19
Author: Jim McDonough <jmcd at samba.org>
Date:   Wed May 25 10:49:41 2011 -0400

    s3-winbind: BUG 8166 - Don't lockout users when offline.
    
    Windows does not track bad password attempts when offline.  We were locking users out but not honoring the lockout duration.
    
    Autobuild-User: Jim McDonough <jmcd at samba.org>
    Autobuild-Date: Wed May 25 18:11:10 CEST 2011 on sn-devel-104
    (cherry picked from commit b58534f1fca27e3e72f4f4107538ec05734bd42a)

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

Summary of changes:
 source3/winbindd/winbindd_pam.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 412ec83..6b87482 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -993,7 +993,10 @@ static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
 
 	}
 
-	/* User does *NOT* know the correct password, modify info3 accordingly */
+	/* User does *NOT* know the correct password, modify info3 accordingly, but only if online */
+	if (domain->online == false) {
+		goto failed;
+	}
 
 	/* failure of this is not critical */
 	result = get_max_bad_attempts_from_lockout_policy(domain, state->mem_ctx, &max_allowed_bad_attempts);


-- 
Samba Shared Repository