[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  1dc3ac2 s3:libsmb: let cli_pull_raw_error() return NT_STATUS_OK as DOS-Error success
      from  81b965a s3-auth: fix uninitialized server_info

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


- Log -----------------------------------------------------------------
commit 1dc3ac242a9027575d0119ec3547ae508e2cb2a9
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Sep 12 09:45:13 2011 +0200

    s3:libsmb: let cli_pull_raw_error() return NT_STATUS_OK as DOS-Error success
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Sep 12 19:12:21 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/libsmb/async_smb.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 0910332..df205dd 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -30,9 +30,14 @@
 static NTSTATUS cli_pull_raw_error(const uint8_t *buf)
 {
 	uint32_t flags2 = SVAL(buf, smb_flg2);
+	NTSTATUS status = NT_STATUS(IVAL(buf, smb_rcls));
+
+	if (NT_STATUS_IS_OK(status)) {
+		return NT_STATUS_OK;
+	}
 
 	if (flags2 & FLAGS2_32_BIT_ERROR_CODES) {
-		return NT_STATUS(IVAL(buf, smb_rcls));
+		return status;
 	}
 
 	return NT_STATUS_DOS(CVAL(buf, smb_rcls), SVAL(buf,smb_err));


-- 
Samba Shared Repository