diff options
| author | Jeremy Allison <jra@samba.org> | 2013-01-25 10:21:48 -0800 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2013-01-28 19:57:02 +0100 |
| commit | 0b7a43250d2102c8e884763a8d4ae00125e4bc31 (patch) | |
| tree | 3e266f874554beb32cd2aaedbadb8d2832054236 | |
| parent | 8464023afa8ac3df716521b75d5f459efbe2b6a7 (diff) | |
| download | samba-0b7a43250d2102c8e884763a8d4ae00125e4bc31.tar.gz | |
Fix bug #9588 - ACLs are not inherited to directories for DFS shares.
We can return with NT_STATUS_OK in an error code path. This
has a really strange effect in that it prevents the ACL editor
in Windows XP from recursively changing ACE entries on sub-directories
after a change in a DFS-root share (we end up returning a path
that looks like: \\IPV4\share1\xptest/testdir with a mixture
of Windows and POSIX pathname separators).
Signed-off-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | source3/smbd/msdfs.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c index b6ebaca1a11..ccbd89cb00f 100644 --- a/source3/smbd/msdfs.c +++ b/source3/smbd/msdfs.c @@ -1000,6 +1000,19 @@ NTSTATUS get_referred_path(TALLOC_CTX *ctx, if (!NT_STATUS_EQUAL(status, NT_STATUS_PATH_NOT_COVERED)) { DEBUG(3,("get_referred_path: No valid referrals for path %s\n", dfs_path)); + if (NT_STATUS_IS_OK(status)) { + /* + * We are in an error path here (we + * know it's not a DFS path), but + * dfs_path_lookup() can return + * NT_STATUS_OK. Ensure we always + * return a valid error code. + * + * #9588 - ACLs are not inherited to directories + * for DFS shares. + */ + status = NT_STATUS_NOT_FOUND; + } goto err_exit; } |