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

[Volker Lendecke]

The branch, v3-6-test has been updated
       via  a0f277f s3-rpc_client: Fixed status check of dcerpc_lsa_lookup_sids_noalloc.
       via  43e8c8e s3-rpc_client: Fixed return values of dcerpc_lsa_lookup_sids_generic.
      from  9d0f33a s3: Make sure we call wbcAuthenticateUserEx correctly

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


- Log -----------------------------------------------------------------
commit a0f277f6b05fdddc3ed87366658573ac399fb011
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 43e8c8e28fda1f70f706e364c8b07794161dd65e
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.

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

Summary of changes:
 source3/rpc_client/cli_lsarpc.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

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