Fix msdfs after the change to smb_filename struct. We must *always*

pull the pathname, then call resolve_dfspath(), before unix_convert().
Jeremy.

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 7887f81ba300ee83555527d9d8bae286a029354a..1b07fc213e683f7ce9e534d14a4c664a7ee2048e 100644 (file)
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -2042,6 +2042,7 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p,
        connection_struct *conn = NULL;
        struct sec_desc_buf *sd_buf = NULL;
        files_struct *fsp = NULL;
        connection_struct *conn = NULL;
        struct sec_desc_buf *sd_buf = NULL;
        files_struct *fsp = NULL;

+       char *fname = NULL;

        int snum;
        char *oldcwd = NULL;
 
        int snum;
        char *oldcwd = NULL;
 


@@ -2066,7 +2067,17 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p,
                goto error_exit;
        }
 
                goto error_exit;
        }
 

-       nt_status = unix_convert(talloc_tos(), conn, r->in.file, &smb_fname,
+       nt_status = resolve_dfspath(talloc_tos(),
+                                       conn,
+                                       false,
+                                       r->in.file,
+                                       &fname);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               werr = ntstatus_to_werror(nt_status);
+               goto error_exit;
+       }
+
+       nt_status = unix_convert(talloc_tos(), conn, fname, &smb_fname,

                                 0);
        if (!NT_STATUS_IS_OK(nt_status)) {
                werr = ntstatus_to_werror(nt_status);
                                 0);
        if (!NT_STATUS_IS_OK(nt_status)) {
                werr = ntstatus_to_werror(nt_status);


@@ -2169,6 +2180,7 @@ WERROR _srvsvc_NetSetFileSecurity(pipes_struct *p,
        char *oldcwd = NULL;
        struct security_descriptor *psd = NULL;
        uint32_t security_info_sent = 0;
        char *oldcwd = NULL;
        struct security_descriptor *psd = NULL;
        uint32_t security_info_sent = 0;

+       char *fname = NULL;

 
        ZERO_STRUCT(st);
 
 
        ZERO_STRUCT(st);
 


@@ -2191,7 +2203,16 @@ WERROR _srvsvc_NetSetFileSecurity(pipes_struct *p,
                goto error_exit;
        }
 
                goto error_exit;
        }
 

-       nt_status = unix_convert(talloc_tos(), conn, r->in.file, &smb_fname,
+       nt_status = resolve_dfspath(talloc_tos(),
+                                       conn,
+                                       false,
+                                       r->in.file,
+                                       &fname);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               werr = ntstatus_to_werror(nt_status);
+               goto error_exit;
+       }
+       nt_status = unix_convert(talloc_tos(), conn, fname, &smb_fname,

                                 0);
        if (!NT_STATUS_IS_OK(nt_status)) {
                werr = ntstatus_to_werror(nt_status);
                                 0);
        if (!NT_STATUS_IS_OK(nt_status)) {
                werr = ntstatus_to_werror(nt_status);

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 7d0324bcdaef9171d55b6c65cc60f6e4d9376d56..a8716d36a3ed009c564a5a09f3f8bbd1fadfd476 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -507,6 +507,23 @@ void reply_ntcreate_and_X(struct smb_request *req)
                        ? BATCH_OPLOCK : 0;
        }
 
                        ? BATCH_OPLOCK : 0;
        }
 

+       status = resolve_dfspath(ctx,
+                               conn,
+                               req->flags2 & FLAGS2_DFS_PATHNAMES,
+                               fname,
+                               &fname);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                       reply_botherror(req,
+                               NT_STATUS_PATH_NOT_COVERED,
+                               ERRSRV, ERRbadpath);
+                       goto out;
+               }
+               reply_nterror(req, status);
+               goto out;
+       }
+

        status = unix_convert(ctx, conn, fname, &smb_fname, 0);
        if (!NT_STATUS_IS_OK(status)) {
                reply_nterror(req, status);
        status = unix_convert(ctx, conn, fname, &smb_fname, 0);
        if (!NT_STATUS_IS_OK(status)) {
                reply_nterror(req, status);


@@ -976,10 +993,21 @@ static void call_nt_transact_create(connection_struct *conn,
                goto out;
        }
 
                goto out;
        }
 

-       oplock_request = (flags & REQUEST_OPLOCK) ? EXCLUSIVE_OPLOCK : 0;
-       if (oplock_request) {
-               oplock_request |= (flags & REQUEST_BATCH_OPLOCK)
-                       ? BATCH_OPLOCK : 0;
+       status = resolve_dfspath(ctx,
+                               conn,
+                               req->flags2 & FLAGS2_DFS_PATHNAMES,
+                               fname,
+                               &fname);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                       reply_botherror(req,
+                               NT_STATUS_PATH_NOT_COVERED,
+                               ERRSRV, ERRbadpath);
+                       goto out;
+               }
+               reply_nterror(req, status);
+               goto out;

        }
 
        status = unix_convert(ctx, conn, fname, &smb_fname, 0);
        }
 
        status = unix_convert(ctx, conn, fname, &smb_fname, 0);


@@ -988,6 +1016,12 @@ static void call_nt_transact_create(connection_struct *conn,
                goto out;
        }
 
                goto out;
        }
 

+       oplock_request = (flags & REQUEST_OPLOCK) ? EXCLUSIVE_OPLOCK : 0;
+       if (oplock_request) {
+               oplock_request |= (flags & REQUEST_BATCH_OPLOCK)
+                       ? BATCH_OPLOCK : 0;
+       }
+

        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */
        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 9c78b9bde0b6a3e891b716a421f3906f392041fa..996cba208b9c032ea7d36eee8d5231079d8f667b 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1769,12 +1769,20 @@ void reply_open(struct smb_request *req)
                goto out;
        }
 
                goto out;
        }
 

-       if (!map_open_params_to_ntcreate(
-                   fname, deny_mode, OPENX_FILE_EXISTS_OPEN, &access_mask,
-                   &share_mode, &create_disposition, &create_options)) {
-               reply_nterror(req, NT_STATUS_DOS(ERRDOS, ERRbadaccess));
-               END_PROFILE(SMBopen);
-               return;
+       status = resolve_dfspath(ctx,
+                               conn,
+                               req->flags2 & FLAGS2_DFS_PATHNAMES,
+                               fname,
+                               &fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                       reply_botherror(req,
+                                       NT_STATUS_PATH_NOT_COVERED,
+                                       ERRSRV, ERRbadpath);
+                       goto out;
+               }
+               reply_nterror(req, status);
+               goto out;

        }
 
        status = unix_convert(ctx, conn, fname, &smb_fname, 0);
        }
 
        status = unix_convert(ctx, conn, fname, &smb_fname, 0);


@@ -1783,6 +1791,13 @@ void reply_open(struct smb_request *req)
                goto out;
        }
 
                goto out;
        }
 

+       if (!map_open_params_to_ntcreate(
+                   fname, deny_mode, OPENX_FILE_EXISTS_OPEN, &access_mask,
+                   &share_mode, &create_disposition, &create_options)) {
+               reply_nterror(req, NT_STATUS_DOS(ERRDOS, ERRbadaccess));
+               goto out;
+       }
+

        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */
        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */


@@ -1915,10 +1930,19 @@ void reply_open_and_X(struct smb_request *req)
                goto out;
        }
 
                goto out;
        }
 

-       if (!map_open_params_to_ntcreate(
-                   fname, deny_mode, smb_ofun, &access_mask,
-                   &share_mode, &create_disposition, &create_options)) {
-               reply_nterror(req, NT_STATUS_DOS(ERRDOS, ERRbadaccess));
+       status = resolve_dfspath(ctx,
+                               conn,
+                               req->flags2 & FLAGS2_DFS_PATHNAMES,
+                               fname,
+                               &fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                       reply_botherror(req,
+                                       NT_STATUS_PATH_NOT_COVERED,
+                                       ERRSRV, ERRbadpath);
+                       goto out;
+               }
+               reply_nterror(req, status);

                goto out;
        }
 
                goto out;
        }
 


@@ -1928,6 +1952,13 @@ void reply_open_and_X(struct smb_request *req)
                goto out;
        }
 
                goto out;
        }
 

+       if (!map_open_params_to_ntcreate(
+                   fname, deny_mode, smb_ofun, &access_mask,
+                   &share_mode, &create_disposition, &create_options)) {
+               reply_nterror(req, NT_STATUS_DOS(ERRDOS, ERRbadaccess));
+               goto out;
+       }
+

        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */
        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */


@@ -2112,6 +2143,28 @@ void reply_mknew(struct smb_request *req)
                goto out;
        }
 
                goto out;
        }
 

+       status = resolve_dfspath(ctx,
+                               conn,
+                               req->flags2 & FLAGS2_DFS_PATHNAMES,
+                               fname,
+                               &fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                       reply_botherror(req,
+                                       NT_STATUS_PATH_NOT_COVERED,
+                                       ERRSRV, ERRbadpath);
+                       goto out;
+               }
+               reply_nterror(req, status);
+               goto out;
+       }
+
+       status = unix_convert(ctx, conn, fname, &smb_fname, 0);
+       if (!NT_STATUS_IS_OK(status)) {
+               reply_nterror(req, status);
+               goto out;
+       }
+

        if (fattr & aVOLID) {
                DEBUG(0,("Attempt to create file (%s) with volid set - "
                        "please report this\n", fname));
        if (fattr & aVOLID) {
                DEBUG(0,("Attempt to create file (%s) with volid set - "
                        "please report this\n", fname));


@@ -2125,12 +2178,6 @@ void reply_mknew(struct smb_request *req)
                create_disposition = FILE_OVERWRITE_IF;
        }
 
                create_disposition = FILE_OVERWRITE_IF;
        }
 

-       status = unix_convert(ctx, conn, fname, &smb_fname, 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               reply_nterror(req, status);
-               goto out;
-       }
-

        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */
        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index ad14b354a9f7a377ac61a220e49441e10a8c6283..81879f1725a4028e31dcafd2a5242e88cada0031 100644 (file)
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -309,13 +309,26 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                }
                info = FILE_WAS_CREATED;
        } else {
                }
                info = FILE_WAS_CREATED;
        } else {

+               char *fname = NULL;
+

                /* these are ignored for SMB2 */
                in_create_options &= ~(0x10);/* NTCREATEX_OPTIONS_SYNC_ALERT */
                in_create_options &= ~(0x20);/* NTCREATEX_OPTIONS_ASYNC_ALERT */
 
                /* these are ignored for SMB2 */
                in_create_options &= ~(0x10);/* NTCREATEX_OPTIONS_SYNC_ALERT */
                in_create_options &= ~(0x20);/* NTCREATEX_OPTIONS_ASYNC_ALERT */
 

-               status = unix_convert(talloc_tos(), smbreq->conn, in_name,
+               status = resolve_dfspath(talloc_tos(),
+                                       smbreq->conn,
+                                       smbreq->flags2 & FLAGS2_DFS_PATHNAMES,
+                                       in_name,
+                                       &fname);
+               if (!NT_STATUS_IS_OK(status)) {
+                       tevent_req_nterror(req, status);
+                       goto out;
+               }
+
+               status = unix_convert(talloc_tos(), smbreq->conn, fname,

                                      &smb_fname, 0);
                if (!NT_STATUS_IS_OK(status)) {
                                      &smb_fname, 0);
                if (!NT_STATUS_IS_OK(status)) {

+                       tevent_req_nterror(req, status);

                        goto out;
                }
 
                        goto out;
                }
 

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 977ef4e8097f91057fdb5426748d4f33d6402adb..f275b94772f3e0b910316c5651eaf1a3e0d6cd12 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -941,6 +941,28 @@ static void call_trans2open(connection_struct *conn,
                fname, (unsigned int)deny_mode, (unsigned int)open_attr,
                (unsigned int)open_ofun, open_size));
 
                fname, (unsigned int)deny_mode, (unsigned int)open_attr,
                (unsigned int)open_ofun, open_size));
 

+       status = resolve_dfspath(ctx,
+                               conn,
+                               req->flags2 & FLAGS2_DFS_PATHNAMES,
+                               fname,
+                               &fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                       reply_botherror(req,
+                               NT_STATUS_PATH_NOT_COVERED,
+                               ERRSRV, ERRbadpath);
+                       goto out;
+               }
+               reply_nterror(req, status);
+               goto out;
+       }
+
+       status = unix_convert(ctx, conn, fname, &smb_fname, 0);
+       if (!NT_STATUS_IS_OK(status)) {
+               reply_nterror(req, status);
+               goto out;
+       }
+

        if (open_ofun == 0) {
                reply_nterror(req, NT_STATUS_OBJECT_NAME_COLLISION);
                goto out;
        if (open_ofun == 0) {
                reply_nterror(req, NT_STATUS_OBJECT_NAME_COLLISION);
                goto out;


@@ -985,12 +1007,6 @@ static void call_trans2open(connection_struct *conn,
                goto out;
        }
 
                goto out;
        }
 

-       status = unix_convert(ctx, conn, fname, &smb_fname, 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               reply_nterror(req, status);
-               goto out;
-       }
-

        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */
        status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                req,                                    /* req */


@@ -3987,6 +4003,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
                                reply_botherror(req,
                                                NT_STATUS_PATH_NOT_COVERED,
                                                ERRSRV, ERRbadpath);
                                reply_botherror(req,
                                                NT_STATUS_PATH_NOT_COVERED,
                                                ERRSRV, ERRbadpath);

+                               return;

                        }
                        reply_nterror(req, status);
                        return;
                        }
                        reply_nterror(req, status);
                        return;