[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  c5be94c libsmb: Use fstr_sprint in convert_sid_to_string
       via  994d08e libsmb: Streamline smb1cli_trans a bit
       via  5af2e3e s3:libsmb: Fix a bug in conversion of ea list to ea array.
      from  5c1ed7f ctdbd_conn: use the right error code from ctdbd_connect for debug and return

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


- Log -----------------------------------------------------------------
commit c5be94c5da5ca9d6baf20632b884f2ee722b1d71
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jun 26 13:29:27 2015 +0200

    libsmb: Use fstr_sprint in convert_sid_to_string
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Fri Jun 26 22:35:02 CEST 2015 on sn-devel-104

commit 994d08e42085b10f9b6a59cd2a8226e3a4ef6967
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jun 26 16:15:18 2015 +0200

    libsmb: Streamline smb1cli_trans a bit
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 5af2e3eed2ac309e2491fc54e03e7b04c8b118fb
Author: Anubhav Rakshit <anubhav.rakshit at gmail.com>
Date:   Fri Jun 26 12:24:23 2015 +0530

    s3:libsmb: Fix a bug in conversion of ea list to ea array.
    
    Bug 11361 - Reading of EA's (Extended Attributes) fails using SMB2 and above
    protocols
    
    Tested against Win2k12r2 server.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11361
    
    Signed-off-by: Anubhav Rakshit <anubhav.rakshit at gmail.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 libcli/smb/smb1cli_trans.c     | 4 +---
 source3/libsmb/cli_smb2_fnum.c | 2 +-
 source3/libsmb/libsmb_xattr.c  | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/smb/smb1cli_trans.c b/libcli/smb/smb1cli_trans.c
index 59888ba..c305463 100644
--- a/libcli/smb/smb1cli_trans.c
+++ b/libcli/smb/smb1cli_trans.c
@@ -864,7 +864,7 @@ NTSTATUS smb1cli_trans(TALLOC_CTX *mem_ctx, struct smbXcli_conn *conn,
 	TALLOC_CTX *frame = talloc_stackframe();
 	struct tevent_context *ev;
 	struct tevent_req *req;
-	NTSTATUS status = NT_STATUS_OK;
+	NTSTATUS status = NT_STATUS_NO_MEMORY;
 
 	if (smbXcli_conn_has_async_calls(conn)) {
 		/*
@@ -876,7 +876,6 @@ NTSTATUS smb1cli_trans(TALLOC_CTX *mem_ctx, struct smbXcli_conn *conn,
 
 	ev = samba_tevent_context_init(frame);
 	if (ev == NULL) {
-		status = NT_STATUS_NO_MEMORY;
 		goto fail;
 	}
 
@@ -890,7 +889,6 @@ NTSTATUS smb1cli_trans(TALLOC_CTX *mem_ctx, struct smbXcli_conn *conn,
 				 param, num_param, max_param,
 				 data, num_data, max_data);
 	if (req == NULL) {
-		status = NT_STATUS_NO_MEMORY;
 		goto fail;
 	}
 
diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
index 21c0340..816ad13 100644
--- a/source3/libsmb/cli_smb2_fnum.c
+++ b/source3/libsmb/cli_smb2_fnum.c
@@ -2194,7 +2194,7 @@ NTSTATUS cli_smb2_get_ea_list_path(struct cli_state *cli,
 		}
 		ea_count = 0;
 		for (eal = ea_list; eal; eal = eal->next) {
-			(*pea_array)[ea_count++] = ea_list->ea;
+			(*pea_array)[ea_count++] = eal->ea;
 		}
 		*pnum_eas = ea_count;
 	}
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index 8c23a8f..442b45f 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -203,9 +203,8 @@ convert_sid_to_string(struct cli_state *ipc_cli,
 
 	/* Converted OK */
 
-	slprintf(str, sizeof(fstring) - 1, "%s%s%s",
-		 domains[0], lp_winbind_separator(),
-		 names[0]);
+	fstr_sprintf(str, "%s%s%s",
+		     domains[0], lp_winbind_separator(), names[0]);
 
 	TALLOC_FREE(ctx);
 }


-- 
Samba Shared Repository