[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  93da0aa s3-rpc_client: Fixed status check of dcerpc_lsa_lookup_sids_noalloc.
       via  296a958 s3-rpc_client: Fixed return values of dcerpc_lsa_lookup_sids_generic.
       via  ad65605 s3-auth: Fixed account lockout check.
      from  9b94f36 s3: Make sure we call wbcAuthenticateUserEx correctly

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


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

    s3-rpc_client: Fixed status check of dcerpc_lsa_lookup_sids_noalloc.
    
    Autobuild-User: Andreas Schneider <asn at samba.org>
    Autobuild-Date: Mon Jan 17 17:35:50 CET 2011 on sn-devel-104

commit 296a958c5790e9d22e5a6b227d53b2a4d4237420
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jan 17 13:39:21 2011 +0100

    s3-rpc_client: Fixed return values of dcerpc_lsa_lookup_sids_generic.

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

    s3-auth: Fixed account lockout check.

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

Summary of changes:
 source3/passdb/pdb_interface.c  |    2 +-
 source3/rpc_client/cli_lsarpc.c |   10 +++++-----
 2 files changed, 6 insertions(+), 6 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);
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 2ffd1c8..e4a989a 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -213,7 +213,7 @@ static NTSTATUS dcerpc_lsa_lookup_sids_noalloc(struct dcerpc_binding_handle *h,
 						LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES,
 						LSA_CLIENT_REVISION_2,
 						&result);
-		if (NT_STATUS_IS_OK(status)) {
+		if (!NT_STATUS_IS_OK(status)) {
 			return status;
 		}
 
@@ -354,19 +354,19 @@ static NTSTATUS dcerpc_lsa_lookup_sids_generic(struct dcerpc_binding_handle *h,
 	if (num_sids) {
 		if (!(domains = TALLOC_ARRAY(mem_ctx, char *, num_sids))) {
 			DEBUG(0, ("rpccli_lsa_lookup_sids(): out of memory\n"));
-			result = NT_STATUS_NO_MEMORY;
+			status = NT_STATUS_NO_MEMORY;
 			goto fail;
 		}
 
 		if (!(names = TALLOC_ARRAY(mem_ctx, char *, num_sids))) {
 			DEBUG(0, ("rpccli_lsa_lookup_sids(): out of memory\n"));
-			result = NT_STATUS_NO_MEMORY;
+			status = NT_STATUS_NO_MEMORY;
 			goto fail;
 		}
 
 		if (!(types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_sids))) {
 			DEBUG(0, ("rpccli_lsa_lookup_sids(): out of memory\n"));
-			result = NT_STATUS_NO_MEMORY;
+			status = NT_STATUS_NO_MEMORY;
 			goto fail;
 		}
 	}
@@ -378,7 +378,7 @@ static NTSTATUS dcerpc_lsa_lookup_sids_generic(struct dcerpc_binding_handle *h,
 
 	while (sids_left > 0) {
 		int hunk_num_sids;
-		NTSTATUS hunk_result;
+		NTSTATUS hunk_result = NT_STATUS_UNSUCCESSFUL;
 
 		hunk_num_sids = ((sids_left > LOOKUP_SIDS_HUNK_SIZE)
 				? LOOKUP_SIDS_HUNK_SIZE


-- 
Samba Shared Repository