The branch, v3-6-test has been updated
via bea2d3d s3-vfs_gpfs: Fix bug #9003, posix acl on gpfs
from 65cc848 s3:winbindd: don't turn negative cache entries into valid
idmappings (bug #9002)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit bea2d3d007cef5643e863d2d4a80f0ea72461ec3
Author: Volker Lendecke <[email protected]>
Date: Fri Jun 22 15:46:13 2012 +0200
s3-vfs_gpfs: Fix bug #9003, posix acl on gpfs
gpfs2smb_acl can leave errno!=0 around even if it returned a correct
result!=NULL. We can only rely on errno being set if another error
condition (in this case result==NULL) indicates an error. If
result!=NULL, errno is undefined and can be anything. This leads to
SAFE_FREE(result) further down even in the success case.
Signed-off-by: Stefan Metzmacher <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Fri Jun 22 19:27:39 CEST 2012 on sn-devel-104
(cherry picked from commit e7b58146d8576ae8bf4eaf2ec1063fe7697e05b8)
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_gpfs.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 08e5f55..0c86ea8 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -598,8 +598,8 @@ static SMB_ACL_T gpfsacl_get_posix_acl(const char *path,
gpfs_aclType_t type)
pacl->acl_nace));
result = gpfs2smb_acl(pacl);
- if (result == NULL) {
- goto done;
+ if (result != NULL) {
+ errno = 0;
}
done:
--
Samba Shared Repository
