diff options
| author | Karolin Seeger <kseeger@samba.org> | 2014-07-28 09:13:45 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-07-28 09:18:00 +0200 |
| commit | fcc634b483255bedf53f3aea40334c018e13dcce (patch) | |
| tree | 7d59833bd515e295e70ec188e1aa2b1436b3355c /source3/modules | |
| parent | 97d7291d12e803076022d71556c792b0cd4e60e8 (diff) | |
| parent | 80a1dfddf9086700a8de5fd6005a9179b0bb3d9e (diff) | |
| download | samba-4.1.10.tar.gz | |
Merge commit 'origin/v4-1-test^' into v4-1-stablesamba-4.1.10
This was needed because of a changed commit message (fixed version number)
in v4-1-stable after generating the 'samba-4.1.9' tag.
Karolin
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/nfs4_acls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index dab1a2abe4c..500cb4772a3 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. |