Attachment 3819 Details for Bug 5986 – Patch

[patch] Patch

look (text/plain), 2.49 KB, created by Jeremy Allison on 2008-12-19 16:58:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2008-12-19 16:58:51 UTC

Size: 2.49 KB

patch

obsolete

>diff --git a/source/smbd/reply.c b/source/smbd/reply.c
>index e445f81..762fab1 100644
>--- a/source/smbd/reply.c
>+++ b/source/smbd/reply.c
>@@ -5556,7 +5556,9 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
> 	}
> 
> 	if(replace_if_exists && dst_exists) {
>-		if (is_ntfs_stream_name(newname)) {
>+		/* Ensure both or neither are stream names. */
>+		if (is_ntfs_stream_name(fsp->fsp_name) !=
>+				is_ntfs_stream_name(newname)) {
> 			return NT_STATUS_INVALID_PARAMETER;
> 		}
> 	}
>diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
>index ebf448f..b6f4c34 100644
>--- a/source/smbd/trans2.c
>+++ b/source/smbd/trans2.c
>@@ -5333,6 +5333,8 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
> 	char *newname = NULL;
> 	char *base_name = NULL;
> 	bool dest_has_wcard = False;
>+	SMB_STRUCT_STAT sbuf;
>+	char *newname_last_component = NULL;
> 	NTSTATUS status = NT_STATUS_OK;
> 	char *p;
> 	TALLOC_CTX *ctx = talloc_tos();
>@@ -5341,6 +5343,8 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
> 		return NT_STATUS_INVALID_PARAMETER;
> 	}
> 
>+	ZERO_STRUCT(sbuf);
>+
> 	overwrite = (CVAL(pdata,0) ? True : False);
> 	root_fid = IVAL(pdata,4);
> 	len = IVAL(pdata,8);
>@@ -5374,6 +5378,7 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
> 	}
> 
> 	if (fsp && fsp->base_fsp) {
>+		/* newname must be a stream name. */
> 		if (newname[0] != ':') {
> 			return NT_STATUS_NOT_SUPPORTED;
> 		}
>@@ -5384,6 +5389,7 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
> 			return NT_STATUS_NO_MEMORY;
> 		}
> 	} else {
>+		/* newname must *not* be a stream name. */
> 		if (is_ntfs_stream_name(newname)) {
> 			return NT_STATUS_NOT_SUPPORTED;
> 		}
>@@ -5409,18 +5415,11 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
> 		if (!base_name) {
> 			return NT_STATUS_NO_MEMORY;
> 		}
>-	}
>-
>-	if (fsp) {
>-		SMB_STRUCT_STAT sbuf;
>-		char *newname_last_component = NULL;
>-
>-		ZERO_STRUCT(sbuf);
> 
> 		status = unix_convert(ctx, conn, newname, False,
>-					&newname,
>-					&newname_last_component,
>-					&sbuf);
>+				&newname,
>+				&newname_last_component,
>+				&sbuf);
> 
> 		/* If an error we expect this to be
> 		 * NT_STATUS_OBJECT_PATH_NOT_FOUND */
>@@ -5430,7 +5429,9 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
> 					status)) {
> 			return status;
> 		}
>+	}
> 
>+	if (fsp) {
> 		DEBUG(10,("smb_file_rename_information: SMB_FILE_RENAME_INFORMATION (fnum %d) %s -> %s\n",
> 			fsp->fnum, fsp->fsp_name, base_name ));
> 		status = rename_internals_fsp(conn, fsp, base_name,

Actions: View

Attachments on bug 5986: 3819