Attachment 5340 Details for Bug 7126 – Correct patch for master

[patch] Correct patch for master

look (text/plain), 1.58 KB, created by Jeremy Allison on 2010-02-12 17:33:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2010-02-12 17:33:00 UTC

Size: 1.58 KB

patch

obsolete

>diff --git a/source3/smbd/service.c b/source3/smbd/service.c
>index d8ba4fe..6e57e1f 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);

Actions: View

Attachments on bug 7126: 5323 | 5339 | 5340 | 5341 | 5342 | 5343