[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  91186fc s3: fix missing braces in nfs4_acls.c
      from  617c647 Fix valgrind errors with memmove and talloc pools.

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


- Log -----------------------------------------------------------------
commit 91186fcf9da6fa1180d9d773882a388e78c4c3b9
Author: Abhidnya Joshi <achirmul at in.ibm.com>
Date:   Mon Aug 26 12:31:49 2013 +0530

    s3: fix missing braces in nfs4_acls.c
    
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Simo Sorce <idra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Aug 28 20:25:56 CEST 2013 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index dab1a2a..500cb47 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -987,9 +987,10 @@ NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
 				  (unsigned int)newGID));
 			if (smbacl4_GetFileOwner(fsp->conn,
 						 fsp->fsp_name->base_name,
-						 &sbuf))
+						 &sbuf)){
 				TALLOC_FREE(frame);
 				return map_nt_error_from_unix(errno);
+			}
 
 			/* If we successfully chowned, we know we must
 			 * be able to set the acl, so do it as root.


-- 
Samba Shared Repository