summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-02-12 15:45:20 -0800
committerJeremy Allison <jra@samba.org>2010-02-12 15:45:20 -0800
commit2fdd8b10c6abadd27c579e772c0482214d2363a5 (patch)
tree1018e862863781b0c5867c46b513a88601273c22
parent72242ef7cd6d2c9b4cc4f82ef1138560cad78df1 (diff)
downloadsamba-2fdd8b10c6abadd27c579e772c0482214d2363a5.tar.gz
samba-2fdd8b10c6abadd27c579e772c0482214d2363a5.tar.bz2
samba-2fdd8b10c6abadd27c579e772c0482214d2363a5.zip
Fix bug #7126 - [SMBD] With access denied error smbd return wrong NT_STATUS_OBJECT_PATH_INVALID error
As tridge's comment says, we should be ignoring ACCESS_DENIED on the share path in a TconX call, instead allowing the mount and having individual SMB calls fail (as Windows does). The original code erroneously caught SMB_VFS_STAT != 0 and errored out on that. Jeremy.
-rw-r--r--source3/smbd/service.c25
1 files changed, 16 insertions, 9 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index d8ba4fee65..6e57e1f0d5 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -1019,20 +1019,27 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
check during individual operations. To match this behaviour
I have disabled this chdir check (tridge) */
/* the alternative is just to check the directory exists */
- if ((ret = SMB_VFS_STAT(conn, smb_fname_cpath)) != 0 ||
- !S_ISDIR(smb_fname_cpath->st.st_ex_mode)) {
- if (ret == 0 && !S_ISDIR(smb_fname_cpath->st.st_ex_mode)) {
+ if (SMB_VFS_STAT(conn, smb_fname_cpath) == 0) {
+ if (!S_ISDIR(smb_fname_cpath->st.st_ex_mode)) {
DEBUG(0,("'%s' is not a directory, when connecting to "
"[%s]\n", conn->connectpath,
lp_servicename(snum)));
- } else {
- DEBUG(0,("'%s' does not exist or permission denied "
- "when connecting to [%s] Error was %s\n",
- conn->connectpath, lp_servicename(snum),
+ *pstatus = NT_STATUS_BAD_NETWORK_NAME;
+ goto err_root_exit;
+ }
+ } else {
+ /* Stat failed. Bail on any error except permission denied. */
+ if (errno != EACCES) {
+ DEBUG(0,("Connecting to share [%s], path '%s' "
+ "gives error %s\n",
+ lp_servicename(snum),
+ conn->connectpath,
strerror(errno) ));
+ *pstatus = NT_STATUS_BAD_NETWORK_NAME;
+ goto err_root_exit;
}
- *pstatus = NT_STATUS_BAD_NETWORK_NAME;
- goto err_root_exit;
+ /* As Windows does, on permsission denied we continue.
+ * Pathname calls fail, not TconX calls. */
}
string_set(&conn->origpath,conn->connectpath);