[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  ec4496b unix_msg: Simplify unix_msg_send a bit
      from  04cddfc torture/smb2/dir: check create time match find

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


- Log -----------------------------------------------------------------
commit ec4496b823a7af6587ce6054452f7ef3bbb66084
Author: Volker Lendecke <vl at samba.org>
Date:   Fri May 23 19:32:04 2014 +0200

    unix_msg: Simplify unix_msg_send a bit
    
    Now that we settled on variable arrays, remove a fixed one
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat May 24 02:56:31 CEST 2014 on sn-devel-104

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

Summary of changes:
 source3/lib/unix_msg/unix_msg.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/unix_msg/unix_msg.c b/source3/lib/unix_msg/unix_msg.c
index ae8ee50..956e3a3 100644
--- a/source3/lib/unix_msg/unix_msg.c
+++ b/source3/lib/unix_msg/unix_msg.c
@@ -658,9 +658,8 @@ int unix_msg_send(struct unix_msg_ctx *ctx, const char *dst_sock,
 		return EINVAL;
 	}
 
-	if ((iovlen < 16) &&
-	    (msglen <= (ctx->fragment_len - sizeof(uint64_t)))) {
-		struct iovec tmp_iov[16];
+	if (msglen <= (ctx->fragment_len - sizeof(uint64_t))) {
+		struct iovec tmp_iov[iovlen+1];
 		uint64_t cookie = 0;
 
 		tmp_iov[0].iov_base = &cookie;


-- 
Samba Shared Repository