diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-11-18 03:45:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:58 -0500 |
| commit | 837909e3abfe6988d1e685c291c2871c0d89f4ed (patch) | |
| tree | 64a350fd0b19fe71b17b5e5a0b27f2a318fb28c2 | |
| parent | 82da254ece1e09218d12b478e2164461306499a3 (diff) | |
| download | samba-837909e3abfe6988d1e685c291c2871c0d89f4ed.tar.gz samba-837909e3abfe6988d1e685c291c2871c0d89f4ed.tar.bz2 samba-837909e3abfe6988d1e685c291c2871c0d89f4ed.zip | |
r3834: - fixed XATTR_NTACL_NAME
- pvfs now passes RAW-ACLS
(This used to be commit 2e19edaa4ebc96b3e95e0b55c4fae8eaefd642b2)
| -rw-r--r-- | source4/ntvfs/posix/pvfs_xattr.c | 4 | ||||
| -rwxr-xr-x | source4/script/tests/test_posix.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/ntvfs/posix/pvfs_xattr.c b/source4/ntvfs/posix/pvfs_xattr.c index 35d06e3fb6..fda15a2e92 100644 --- a/source4/ntvfs/posix/pvfs_xattr.c +++ b/source4/ntvfs/posix/pvfs_xattr.c @@ -361,7 +361,7 @@ NTSTATUS pvfs_acl_load(struct pvfs_state *pvfs, struct pvfs_filename *name, int return NT_STATUS_OK; } status = pvfs_xattr_ndr_load(pvfs, acl, name->full_name, fd, - XATTR_DOSACL_NAME, + XATTR_NTACL_NAME, acl, (ndr_pull_flags_fn_t)ndr_pull_xattr_NTACL); return status; @@ -384,7 +384,7 @@ NTSTATUS pvfs_acl_save(struct pvfs_state *pvfs, struct pvfs_filename *name, int admin privileges to set it */ privs = root_privileges(); status = pvfs_xattr_ndr_save(pvfs, name->full_name, fd, - XATTR_DOSACL_NAME, + XATTR_NTACL_NAME, acl, (ndr_push_flags_fn_t)ndr_push_xattr_NTACL); talloc_free(privs); diff --git a/source4/script/tests/test_posix.sh b/source4/script/tests/test_posix.sh index 93732d438d..06bb43abad 100755 --- a/source4/script/tests/test_posix.sh +++ b/source4/script/tests/test_posix.sh @@ -41,7 +41,7 @@ tests="$tests BASE-NTDENY1 BASE-NTDENY2 BASE-RENAME BASE-OPENATTR" tests="$tests RAW-QFSINFO RAW-QFILEINFO RAW-SFILEINFO-BUG RAW-SFILEINFO" tests="$tests RAW-LOCK RAW-MKDIR RAW-SEEK RAW-CONTEXT RAW-MUX RAW-OPEN RAW-WRITE" tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-SEARCH RAW-CHKPATH RAW-RENAME" -tests="$tests RAW-EAS RAW-STREAMS" +tests="$tests RAW-EAS RAW-STREAMS RAW-ACLS" tests="$tests LOCAL-ICONV LOCAL-TALLOC LOCAL-MESSAGING LOCAL-BINDING LOCAL-IDTREE" soon="BASE-CHARSET RAW-OPLOCK RAW-NOTIFY BASE-DELAYWRITE" |