Attachment 5154 Details for Bug 6642 – New patch for v3-3 (and v3-2)

[patch] New patch for v3-3 (and v3-2)

tmp.diff (text/plain), 1.74 KB, created by Stefan Metzmacher on 2010-01-11 04:25:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2010-01-11 04:25:38 UTC

Size: 1.74 KB

patch

obsolete

>From d780a951bd4cc51716667afebe034e3bfc41e644 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Mon, 21 Dec 2009 16:26:34 +0100
>Subject: [PATCH] smbd: Fix opening the quota magic file
>
>This fixes bug #6642 and bug #6919.
>
>metze
>---
> source/smbd/reply.c |   15 ++++++++++-----
> 1 files changed, 10 insertions(+), 5 deletions(-)
>
>diff --git a/source/smbd/reply.c b/source/smbd/reply.c
>index 8c20e95..1141cfe 100644
>--- a/source/smbd/reply.c
>+++ b/source/smbd/reply.c
>@@ -50,9 +50,9 @@ static NTSTATUS check_path_syntax_internal(char *path,
> {
> 	char *d = path;
> 	const char *s = path;
>-	NTSTATUS ret = NT_STATUS_OK;
> 	bool start_of_name_component = True;
> 	bool stream_started = false;
>+	bool check_quota = false;
> 
> 	*p_last_component_contains_wcard = False;
> 
>@@ -70,7 +70,7 @@ static NTSTATUS check_path_syntax_internal(char *path,
> 					return NT_STATUS_OBJECT_NAME_INVALID;
> 				}
> 				if (StrCaseCmp(s, ":$DATA") != 0) {
>-					return NT_STATUS_INVALID_PARAMETER;
>+					check_quota = true;
> 				}
> 				break;
> 			}
>@@ -131,8 +131,7 @@ static NTSTATUS check_path_syntax_internal(char *path,
> 
> 				/* Are we at the start ? Can't go back further if so. */
> 				if (d <= path) {
>-					ret = NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
>-					break;
>+					return NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
> 				}
> 				/* Go back one level... */
> 				/* We know this is safe as '/' cannot be part of a mb sequence. */
>@@ -205,7 +204,13 @@ static NTSTATUS check_path_syntax_internal(char *path,
> 
> 	*d = '\0';
> 
>-	return ret;
>+	if (check_quota) {
>+		if (StrCaseCmp(path, FAKE_FILE_NAME_QUOTA_UNIX) != 0) {
>+			return NT_STATUS_INVALID_PARAMETER;
>+		}
>+	}
>+
>+	return NT_STATUS_OK;
> }
> 
> /****************************************************************************
>-- 
>1.6.3.3
>

Flags:

metze: review? (jra)

Actions: View

Attachments on bug 6642: 4625 | 5104 | 5105 | 5115 | 5117 | 5120 | 5154 | 5155 | 5156