[SCM] Samba Shared Repository - branch v3-3-test updated

[Karolin Seeger]

The branch, v3-3-test has been updated
       via  c30bd2f... smbd: Fix opening the quota magic file
      from  b6ce892... s3:smbd: Fix bug 6696

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit c30bd2f2ac1c79a4c3893b2c28e0ba7997685c01
Author: Stefan Metzmacher <me...@samba.org>
Date:   Mon Dec 21 16:26:34 2009 +0100

    smbd: Fix opening the quota magic file
    
    This fixes bug #6642 and bug #6919.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/reply.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

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;
 }
 
 /****************************************************************************


-- 
Samba Shared Repository