Remove call into reduce_name if case sensitive. This allows us to pass
[ira/wip.git] / source3 / smbd / filename.c
index 059dca29c8dfc3abfac337b953fd182c80401558..16e36312bbf78fa472f36ab6e9f6a05f55310086 100644 (file)
@@ -80,23 +80,6 @@ static NTSTATUS determine_path_error(const char *name,
        }
 }
 
-NTSTATUS get_full_smb_filename(TALLOC_CTX *ctx, const struct smb_filename *smb_fname,
-                              char **full_name)
-{
-       if (smb_fname->stream_name) {
-               *full_name = talloc_asprintf(ctx, "%s%s", smb_fname->base_name,
-                                            smb_fname->stream_name);
-       } else {
-               *full_name = talloc_strdup(ctx, smb_fname->base_name);
-       }
-
-       if (!*full_name) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       return NT_STATUS_OK;
-}
-
 /****************************************************************************
 This routine is called to convert names from the dos namespace to unix
 namespace. It needs to handle any case conversions, mangling, format changes,
@@ -115,8 +98,8 @@ processing whilst resolving.
 If the UCF_SAVE_LCOMP flag is passed in, then the unmodified last component
 of the pathname is set in smb_filename->original_lcomp.
 
-If UCF_ALLOW_WCARD_LCOMP is passed in, then a MS wildcard was detected and
-should be allowed in the last component of the path only.
+If UCF_ALWAYS_ALLOW_WCARD_LCOMP is passed in, then a MS wildcard was detected
+and should be allowed in the last component of the path only.
 
 If the orig_path was a stream, smb_filename->base_name will point to the base
 filename, and smb_filename->stream_name will point to the stream name.  If
@@ -134,23 +117,22 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                      struct smb_filename **smb_fname_out,
                      uint32_t ucf_flags)
 {
-       SMB_STRUCT_STAT st;
        struct smb_filename *smb_fname = NULL;
        char *start, *end;
        char *dirpath = NULL;
-       char *name = NULL;
        char *stream = NULL;
        bool component_was_mangled = False;
        bool name_has_wildcard = False;
        bool posix_pathnames = false;
-       bool allow_wcard_last_component = ucf_flags & UCF_ALLOW_WCARD_LCOMP;
+       bool allow_wcard_last_component =
+           (ucf_flags & UCF_ALWAYS_ALLOW_WCARD_LCOMP);
        bool save_last_component = ucf_flags & UCF_SAVE_LCOMP;
-       NTSTATUS result;
+       NTSTATUS status;
        int ret = -1;
 
        *smb_fname_out = NULL;
 
-       smb_fname = TALLOC_ZERO_P(talloc_tos(), struct smb_filename);
+       smb_fname = talloc_zero(ctx, struct smb_filename);
        if (smb_fname == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -160,10 +142,10 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                        filename - so don't convert them */
                if (!(smb_fname->base_name = talloc_strdup(smb_fname,
                                                           orig_path))) {
-                       return NT_STATUS_NO_MEMORY;
+                       status = NT_STATUS_NO_MEMORY;
+                       goto err;
                }
-               *smb_fname_out = smb_fname;
-               return NT_STATUS_OK;
+               goto done;
        }
 
        DEBUG(5, ("unix_convert called on file \"%s\"\n", orig_path));
@@ -191,15 +173,16 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
         */
 
        if (!*orig_path) {
-               if (!(name = talloc_strdup(ctx,"."))) {
-                       return NT_STATUS_NO_MEMORY;
+               if (!(smb_fname->base_name = talloc_strdup(smb_fname, "."))) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto err;
                }
-               if (SMB_VFS_STAT(conn,name,&st) == 0) {
-                       smb_fname->st = st;
-               } else {
-                       return map_nt_error_from_unix(errno);
+               if (SMB_VFS_STAT(conn, smb_fname) != 0) {
+                       status = map_nt_error_from_unix(errno);
+                       goto err;
                }
-               DEBUG(5,("conversion finished \"\" -> %s\n",name));
+               DEBUG(5, ("conversion finished \"\" -> %s\n",
+                         smb_fname->base_name));
                goto done;
        }
 
@@ -207,17 +190,19 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                                orig_path[1] == '\0')) {
                /* Start of pathname can't be "." only. */
                if (orig_path[1] == '\0' || orig_path[2] == '\0') {
-                       result = NT_STATUS_OBJECT_NAME_INVALID;
+                       status = NT_STATUS_OBJECT_NAME_INVALID;
                } else {
-                       result =determine_path_error(
-                               &orig_path[2], allow_wcard_last_component);
+                       status =determine_path_error(&orig_path[2],
+                           allow_wcard_last_component);
                }
-               return result;
+               goto err;
        }
 
-       if (!(name = talloc_strdup(ctx, orig_path))) {
+       /* Start with the full orig_path as given by the caller. */
+       if (!(smb_fname->base_name = talloc_strdup(smb_fname, orig_path))) {
                DEBUG(0, ("talloc_strdup failed\n"));
-               return NT_STATUS_NO_MEMORY;
+               status = NT_STATUS_NO_MEMORY;
+               goto err;
        }
 
        /*
@@ -231,7 +216,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
 
        if (conn->case_sensitive && !conn->case_preserve &&
                        !conn->short_case_preserve) {
-               strnorm(name, lp_defaultcase(SNUM(conn)));
+               strnorm(smb_fname->base_name, lp_defaultcase(SNUM(conn)));
        }
 
        /*
@@ -239,44 +224,61 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
         */
 
        if(save_last_component) {
-               end = strrchr_m(name, '/');
+               end = strrchr_m(smb_fname->base_name, '/');
                if (end) {
-                       smb_fname->original_lcomp = talloc_strdup(ctx,
+                       smb_fname->original_lcomp = talloc_strdup(smb_fname,
                                                                  end + 1);
                } else {
-                       smb_fname->original_lcomp = talloc_strdup(ctx, name);
+                       smb_fname->original_lcomp =
+                           talloc_strdup(smb_fname, smb_fname->base_name);
+               }
+               if (smb_fname->original_lcomp == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto err;
                }
        }
 
-       posix_pathnames = lp_posix_pathnames();
+       posix_pathnames = (lp_posix_pathnames() ||
+                               (ucf_flags & UCF_POSIX_PATHNAMES));
 
-       /* Strip off the stream. Should we use any of the other stream parsing
-        * at this point? Also, should we set the is_stream bit? */
+       /*
+        * Strip off the stream, and add it back when we're done with the
+        * base_name.
+        */
        if (!posix_pathnames) {
-               stream = strchr_m(name, ':');
+               stream = strchr_m(smb_fname->base_name, ':');
 
                if (stream != NULL) {
-                       char *tmp = talloc_strdup(ctx, stream);
+                       char *tmp = talloc_strdup(smb_fname, stream);
                        if (tmp == NULL) {
-                               TALLOC_FREE(name);
-                               return NT_STATUS_NO_MEMORY;
+                               status = NT_STATUS_NO_MEMORY;
+                               goto err;
                        }
+                       /*
+                        * Since this is actually pointing into
+                        * smb_fname->base_name this truncates base_name.
+                        */
                        *stream = '\0';
                        stream = tmp;
                }
        }
 
-       start = name;
+       start = smb_fname->base_name;
 
-       /* If we're providing case insentive semantics or
+       /*
+        * If we're providing case insentive semantics or
         * the underlying filesystem is case insensitive,
         * then a case-normalized hit in the stat-cache is
         * authoratitive. JRA.
+        *
+        * Note: We're only checking base_name.  The stream_name will be
+        * added and verified in build_stream_path().
         */
 
-       if((!conn->case_sensitive || !(conn->fs_capabilities & FILE_CASE_SENSITIVE_SEARCH)) &&
-                       stat_cache_lookup(conn, &name, &dirpath, &start, &st)) {
-               smb_fname->st = st;
+       if((!conn->case_sensitive || !(conn->fs_capabilities &
+                                      FILE_CASE_SENSITIVE_SEARCH)) &&
+           stat_cache_lookup(conn, &smb_fname->base_name, &dirpath, &start,
+                             &smb_fname->st)) {
                goto done;
        }
 
@@ -287,43 +289,46 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
 
        if ((dirpath == NULL) && (!(dirpath = talloc_strdup(ctx,"")))) {
                DEBUG(0, ("talloc_strdup failed\n"));
-               TALLOC_FREE(name);
-               return NT_STATUS_NO_MEMORY;
+               status = NT_STATUS_NO_MEMORY;
+               goto err;
        }
 
        /*
-        * stat the name - if it exists then we are all done!
+        * stat the name - if it exists then we can add the stream back (if
+        * there was one) and be done!
         */
 
        if (posix_pathnames) {
-               ret = SMB_VFS_LSTAT(conn,name,&st);
+               ret = SMB_VFS_LSTAT(conn, smb_fname);
        } else {
-               ret = SMB_VFS_STAT(conn,name,&st);
+               ret = SMB_VFS_STAT(conn, smb_fname);
        }
 
        if (ret == 0) {
                /* Ensure we catch all names with in "/."
                   this is disallowed under Windows. */
-               const char *p = strstr(name, "/."); /* mb safe. */
+               const char *p = strstr(smb_fname->base_name, "/."); /*mb safe*/
                if (p) {
                        if (p[2] == '/') {
                                /* Error code within a pathname. */
-                               result = NT_STATUS_OBJECT_PATH_NOT_FOUND;
+                               status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
                                goto fail;
                        } else if (p[2] == '\0') {
                                /* Error code at the end of a pathname. */
-                               result = NT_STATUS_OBJECT_NAME_INVALID;
+                               status = NT_STATUS_OBJECT_NAME_INVALID;
                                goto fail;
                        }
                }
-               stat_cache_add(orig_path, name, conn->case_sensitive);
-               DEBUG(5,("conversion finished %s -> %s\n",orig_path, name));
-               smb_fname->st = st;
+               /* Add the path (not including the stream) to the cache. */
+               stat_cache_add(orig_path, smb_fname->base_name,
+                              conn->case_sensitive);
+               DEBUG(5,("conversion of base_name finished %s -> %s\n",
+                        orig_path, smb_fname->base_name));
                goto done;
        }
 
        DEBUG(5,("unix_convert begin: name = %s, dirpath = %s, start = %s\n",
-                               name, dirpath, start));
+                smb_fname->base_name, dirpath, start));
 
        /*
         * A special case - if we don't have any mangling chars and are case
@@ -331,8 +336,9 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
         * won't help.
         */
 
-       if ((conn->case_sensitive || !(conn->fs_capabilities & FILE_CASE_SENSITIVE_SEARCH)) &&
-                       !mangle_is_mangled(name, conn->params)) {
+       if ((conn->case_sensitive || !(conn->fs_capabilities &
+                                      FILE_CASE_SENSITIVE_SEARCH)) &&
+           !mangle_is_mangled(smb_fname->base_name, conn->params)) {
                goto done;
        }
 
@@ -371,11 +377,12 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
 
                if (save_last_component) {
                        TALLOC_FREE(smb_fname->original_lcomp);
-                       smb_fname->original_lcomp = talloc_strdup(ctx,
+                       smb_fname->original_lcomp = talloc_strdup(smb_fname,
                                                        end ? end + 1 : start);
                        if (!smb_fname->original_lcomp) {
                                DEBUG(0, ("talloc failed\n"));
-                               return NT_STATUS_NO_MEMORY;
+                               status = NT_STATUS_NO_MEMORY;
+                               goto err;
                        }
                }
 
@@ -384,9 +391,9 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                if (ISDOT(start)) {
                        if (!end)  {
                                /* Error code at the end of a pathname. */
-                               result = NT_STATUS_OBJECT_NAME_INVALID;
+                               status = NT_STATUS_OBJECT_NAME_INVALID;
                        } else {
-                               result = determine_path_error(end+1,
+                               status = determine_path_error(end+1,
                                                allow_wcard_last_component);
                        }
                        goto fail;
@@ -399,13 +406,13 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
 
                /* Wildcard not valid anywhere. */
                if (name_has_wildcard && !allow_wcard_last_component) {
-                       result = NT_STATUS_OBJECT_NAME_INVALID;
+                       status = NT_STATUS_OBJECT_NAME_INVALID;
                        goto fail;
                }
 
                /* Wildcards never valid within a pathname. */
                if (name_has_wildcard && end) {
-                       result = NT_STATUS_OBJECT_NAME_INVALID;
+                       status = NT_STATUS_OBJECT_NAME_INVALID;
                        goto fail;
                }
 
@@ -414,9 +421,9 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                 */
 
                if (posix_pathnames) {
-                       ret = SMB_VFS_LSTAT(conn,name, &st);
+                       ret = SMB_VFS_LSTAT(conn, smb_fname);
                } else {
-                       ret = SMB_VFS_STAT(conn,name, &st);
+                       ret = SMB_VFS_STAT(conn, smb_fname);
                }
 
                if (ret == 0) {
@@ -424,7 +431,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                         * It exists. it must either be a directory or this must
                         * be the last part of the path for it to be OK.
                         */
-                       if (end && !S_ISDIR(st.st_ex_mode)) {
+                       if (end && !S_ISDIR(smb_fname->st.st_ex_mode)) {
                                /*
                                 * An intermediate part of the name isn't
                                 * a directory.
@@ -439,25 +446,15 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                                 * applications depend on the difference between
                                 * these two errors.
                                 */
-                               result = NT_STATUS_OBJECT_PATH_NOT_FOUND;
+                               status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
                                goto fail;
                        }
 
-                       if (!end) {
-                               /*
-                                * We just scanned for, and found the end of
-                                * the path. We must return the valid stat
-                                * struct. JRA.
-                                */
-
-                               smb_fname->st = st;
-                       }
-
                } else {
                        char *found_name = NULL;
 
                        /* Stat failed - ensure we don't use it. */
-                       SET_STAT_INVALID(st);
+                       SET_STAT_INVALID(smb_fname->st);
 
                        /*
                         * Reset errno so we can detect
@@ -503,11 +500,11 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                                        if (errno == ENOENT ||
                                                        errno == ENOTDIR ||
                                                        errno == ELOOP) {
-                                               result =
+                                               status =
                                                NT_STATUS_OBJECT_PATH_NOT_FOUND;
                                        }
                                        else {
-                                               result =
+                                               status =
                                                map_nt_error_from_unix(errno);
                                        }
                                        goto fail;
@@ -528,10 +525,10 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                                         */
                                        if (errno == ENOTDIR ||
                                                        errno == ELOOP) {
-                                               result =
+                                               status =
                                                NT_STATUS_OBJECT_PATH_NOT_FOUND;
                                        } else {
-                                               result =
+                                               status =
                                                map_nt_error_from_unix(errno);
                                        }
                                        goto fail;
@@ -563,12 +560,13 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                                                        &unmangled,
                                                        conn->params)) {
                                        char *tmp;
-                                       size_t start_ofs = start - name;
+                                       size_t start_ofs =
+                                           start - smb_fname->base_name;
 
                                        if (*dirpath != '\0') {
-                                               tmp = talloc_asprintf(ctx,
-                                                       "%s/%s", dirpath,
-                                                       unmangled);
+                                               tmp = talloc_asprintf(
+                                                       smb_fname, "%s/%s",
+                                                       dirpath, unmangled);
                                                TALLOC_FREE(unmangled);
                                        }
                                        else {
@@ -576,11 +574,13 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                                        }
                                        if (tmp == NULL) {
                                                DEBUG(0, ("talloc failed\n"));
-                                               return NT_STATUS_NO_MEMORY;
+                                               status = NT_STATUS_NO_MEMORY;
+                                               goto err;
                                        }
-                                       TALLOC_FREE(name);
-                                       name = tmp;
-                                       start = name + start_ofs;
+                                       TALLOC_FREE(smb_fname->base_name);
+                                       smb_fname->base_name = tmp;
+                                       start =
+                                           smb_fname->base_name + start_ofs;
                                        end = start + strlen(start);
                                }
 
@@ -595,46 +595,50 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                         */
                        if (end) {
                                char *tmp;
-                               size_t start_ofs = start - name;
+                               size_t start_ofs =
+                                   start - smb_fname->base_name;
 
                                if (*dirpath != '\0') {
-                                       tmp = talloc_asprintf(ctx,
+                                       tmp = talloc_asprintf(smb_fname,
                                                "%s/%s/%s", dirpath,
                                                found_name, end+1);
                                }
                                else {
-                                       tmp = talloc_asprintf(ctx,
+                                       tmp = talloc_asprintf(smb_fname,
                                                "%s/%s", found_name,
                                                end+1);
                                }
                                if (tmp == NULL) {
                                        DEBUG(0, ("talloc_asprintf failed\n"));
-                                       return NT_STATUS_NO_MEMORY;
+                                       status = NT_STATUS_NO_MEMORY;
+                                       goto err;
                                }
-                               TALLOC_FREE(name);
-                               name = tmp;
-                               start = name + start_ofs;
+                               TALLOC_FREE(smb_fname->base_name);
+                               smb_fname->base_name = tmp;
+                               start = smb_fname->base_name + start_ofs;
                                end = start + strlen(found_name);
                                *end = '\0';
                        } else {
                                char *tmp;
-                               size_t start_ofs = start - name;
+                               size_t start_ofs =
+                                   start - smb_fname->base_name;
 
                                if (*dirpath != '\0') {
-                                       tmp = talloc_asprintf(ctx,
+                                       tmp = talloc_asprintf(smb_fname,
                                                "%s/%s", dirpath,
                                                found_name);
                                } else {
-                                       tmp = talloc_strdup(ctx,
+                                       tmp = talloc_strdup(smb_fname,
                                                found_name);
                                }
                                if (tmp == NULL) {
                                        DEBUG(0, ("talloc failed\n"));
-                                       return NT_STATUS_NO_MEMORY;
+                                       status = NT_STATUS_NO_MEMORY;
+                                       goto err;
                                }
-                               TALLOC_FREE(name);
-                               name = tmp;
-                               start = name + start_ofs;
+                               TALLOC_FREE(smb_fname->base_name);
+                               smb_fname->base_name = tmp;
+                               start = smb_fname->base_name + start_ofs;
 
                                /*
                                 * We just scanned for, and found the end of
@@ -643,15 +647,13 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                                 */
 
                                if (posix_pathnames) {
-                                       ret = SMB_VFS_LSTAT(conn,name, &st);
+                                       ret = SMB_VFS_LSTAT(conn, smb_fname);
                                } else {
-                                       ret = SMB_VFS_STAT(conn,name, &st);
+                                       ret = SMB_VFS_STAT(conn, smb_fname);
                                }
 
-                               if (ret == 0) {
-                                       smb_fname->st = st;
-                               } else {
-                                       SET_STAT_INVALID(st);
+                               if (ret != 0) {
+                                       SET_STAT_INVALID(smb_fname->st);
                                }
                        }
 
@@ -664,12 +666,13 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                 * We should never provide different behaviors
                 * depending on DEVELOPER!!!
                 */
-               if (VALID_STAT(st)) {
+               if (VALID_STAT(smb_fname->st)) {
                        bool delete_pending;
-                       get_file_infos(vfs_file_id_from_sbuf(conn, &st),
+                       get_file_infos(vfs_file_id_from_sbuf(conn,
+                                                            &smb_fname->st),
                                       &delete_pending, NULL);
                        if (delete_pending) {
-                               result = NT_STATUS_DELETE_PENDING;
+                               status = NT_STATUS_DELETE_PENDING;
                                goto fail;
                        }
                }
@@ -684,7 +687,8 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                                        "%s/%s", dirpath, start);
                        if (!tmp) {
                                DEBUG(0, ("talloc_asprintf failed\n"));
-                               return NT_STATUS_NO_MEMORY;
+                               status = NT_STATUS_NO_MEMORY;
+                               goto err;
                        }
                        TALLOC_FREE(dirpath);
                        dirpath = tmp;
@@ -693,15 +697,15 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
                        TALLOC_FREE(dirpath);
                        if (!(dirpath = talloc_strdup(ctx,start))) {
                                DEBUG(0, ("talloc_strdup failed\n"));
-                               return NT_STATUS_NO_MEMORY;
+                               status = NT_STATUS_NO_MEMORY;
+                               goto err;
                        }
                }
 
                /*
-                * Don't cache a name with mangled or wildcard components
-                * as this can change the size.
+                * Cache the dirpath thus far. Don't cache a name with mangled
+                * or wildcard components as this can change the size.
                 */
-
                if(!component_was_mangled && !name_has_wildcard) {
                        stat_cache_add(orig_path, dirpath,
                                        conn->case_sensitive);
@@ -716,29 +720,30 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
        }
 
        /*
-        * Don't cache a name with mangled or wildcard components
-        * as this can change the size.
+        * Cache the full path. Don't cache a name with mangled or wildcard
+        * components as this can change the size.
         */
 
        if(!component_was_mangled && !name_has_wildcard) {
-               stat_cache_add(orig_path, name, conn->case_sensitive);
+               stat_cache_add(orig_path, smb_fname->base_name,
+                              conn->case_sensitive);
        }
 
        /*
         * The name has been resolved.
         */
 
-       DEBUG(5,("conversion finished %s -> %s\n",orig_path, name));
+       DEBUG(5,("conversion finished %s -> %s\n", orig_path,
+                smb_fname->base_name));
 
  done:
-       smb_fname->base_name = name;
-
+       /* Add back the stream if one was stripped off originally. */
        if (stream != NULL) {
                smb_fname->stream_name = stream;
 
                /* Check path now that the base_name has been converted. */
-               result = build_stream_path(ctx, conn, orig_path, smb_fname);
-               if (!NT_STATUS_IS_OK(result)) {
+               status = build_stream_path(ctx, conn, orig_path, smb_fname);
+               if (!NT_STATUS_IS_OK(status)) {
                        goto fail;
                }
        }
@@ -748,20 +753,23 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
  fail:
        DEBUG(10, ("dirpath = [%s] start = [%s]\n", dirpath, start));
        if (*dirpath != '\0') {
-               smb_fname->base_name = talloc_asprintf(ctx, "%s/%s", dirpath,
-                                                      start);
+               smb_fname->base_name = talloc_asprintf(smb_fname, "%s/%s",
+                                                      dirpath, start);
        } else {
-               smb_fname->base_name = talloc_strdup(ctx, start);
+               smb_fname->base_name = talloc_strdup(smb_fname, start);
        }
        if (!smb_fname->base_name) {
                DEBUG(0, ("talloc_asprintf failed\n"));
-               return NT_STATUS_NO_MEMORY;
+               status = NT_STATUS_NO_MEMORY;
+               goto err;
        }
 
        *smb_fname_out = smb_fname;
-       TALLOC_FREE(name);
        TALLOC_FREE(dirpath);
-       return result;
+       return status;
+ err:
+       TALLOC_FREE(smb_fname);
+       return status;
 }
 
 /****************************************************************************
@@ -822,7 +830,8 @@ static int get_real_filename_full_scan(connection_struct *conn,
                                       TALLOC_CTX *mem_ctx, char **found_name)
 {
        struct smb_Dir *cur_dir;
-       const char *dname;
+       const char *dname = NULL;
+       char *talloced = NULL;
        char *unmangled_name = NULL;
        long curpos;
 
@@ -874,10 +883,11 @@ static int get_real_filename_full_scan(connection_struct *conn,
 
        /* now scan for matching names */
        curpos = 0;
-       while ((dname = ReadDirName(cur_dir, &curpos, NULL))) {
+       while ((dname = ReadDirName(cur_dir, &curpos, NULL, &talloced))) {
 
                /* Is it dot or dot dot. */
                if (ISDOT(dname) || ISDOTDOT(dname)) {
+                       TALLOC_FREE(talloced);
                        continue;
                }
 
@@ -900,10 +910,13 @@ static int get_real_filename_full_scan(connection_struct *conn,
                        TALLOC_FREE(cur_dir);
                        if (!*found_name) {
                                errno = ENOMEM;
+                               TALLOC_FREE(talloced);
                                return -1;
                        }
+                       TALLOC_FREE(talloced);
                        return 0;
                }
+               TALLOC_FREE(talloced);
        }
 
        TALLOC_FREE(unmangled_name);
@@ -952,23 +965,18 @@ static NTSTATUS build_stream_path(TALLOC_CTX *mem_ctx,
                                  const char *orig_path,
                                  struct smb_filename *smb_fname)
 {
-       char *result = NULL;
        NTSTATUS status;
        unsigned int i, num_streams;
        struct stream_struct *streams = NULL;
 
-       status = get_full_smb_filename(mem_ctx, smb_fname, &result);
-       if (!NT_STATUS_IS_OK(status)) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (SMB_VFS_STAT(conn, result, &smb_fname->st) == 0) {
+       if (SMB_VFS_STAT(conn, smb_fname) == 0) {
+               DEBUG(10, ("'%s' exists\n", smb_fname_str_dbg(smb_fname)));
                return NT_STATUS_OK;
        }
 
        if (errno != ENOENT) {
+               DEBUG(10, ("vfs_stat failed: %s\n", strerror(errno)));
                status = map_nt_error_from_unix(errno);
-               DEBUG(10, ("vfs_stat failed: %s\n", nt_errstr(status)));
                goto fail;
        }
 
@@ -1009,26 +1017,106 @@ static NTSTATUS build_stream_path(TALLOC_CTX *mem_ctx,
 
 
        TALLOC_FREE(smb_fname->stream_name);
-       smb_fname->stream_name = talloc_strdup(mem_ctx, streams[i].name);
-
-       TALLOC_FREE(result);
-       status = get_full_smb_filename(mem_ctx, smb_fname, &result);
-       if (!NT_STATUS_IS_OK(status)) {
+       smb_fname->stream_name = talloc_strdup(smb_fname, streams[i].name);
+       if (smb_fname->stream_name == NULL) {
                status = NT_STATUS_NO_MEMORY;
                goto fail;
        }
 
        SET_STAT_INVALID(smb_fname->st);
 
-       if (SMB_VFS_STAT(conn, result, &smb_fname->st) == 0) {
-               stat_cache_add(orig_path, result, conn->case_sensitive);
+       if (SMB_VFS_STAT(conn, smb_fname) == 0) {
+               DEBUG(10, ("'%s' exists\n", smb_fname_str_dbg(smb_fname)));
        }
-
-       TALLOC_FREE(streams);
-       return NT_STATUS_OK;
-
+       status = NT_STATUS_OK;
  fail:
-       TALLOC_FREE(result);
        TALLOC_FREE(streams);
        return status;
 }
+
+/**
+ * Go through all the steps to validate a filename.
+ *
+ * @param ctx          talloc_ctx to allocate memory with.
+ * @param conn         connection struct for vfs calls.
+ * @param dfs_path     Whether this path requires dfs resolution.
+ * @param name_in      The unconverted name.
+ * @param ucf_flags    flags to pass through to unix_convert().
+ *                     UCF_ALWAYS_ALLOW_WCARD_LCOMP will be OR'd in if
+ *                     p_cont_wcard != NULL and is true and
+ *                     UCF_COND_ALLOW_WCARD_LCOMP.
+ * @param p_cont_wcard If not NULL, will be set to true if the dfs path
+ *                     resolution detects a wildcard.
+ * @param pp_smb_fname The final converted name will be allocated if the
+ *                     return is NT_STATUS_OK.
+ *
+ * @return NT_STATUS_OK if all operations completed succesfully, appropriate
+ *        error otherwise.
+ */
+NTSTATUS filename_convert(TALLOC_CTX *ctx,
+                               connection_struct *conn,
+                               bool dfs_path,
+                               const char *name_in,
+                               uint32_t ucf_flags,
+                               bool *ppath_contains_wcard,
+                               struct smb_filename **pp_smb_fname)
+{
+       NTSTATUS status;
+       char *fname = NULL;
+
+       *pp_smb_fname = NULL;
+
+       status = resolve_dfspath_wcard(ctx, conn,
+                               dfs_path,
+                               name_in,
+                               &fname,
+                               ppath_contains_wcard);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10,("filename_convert: resolve_dfspath failed "
+                       "for name %s with %s\n",
+                       name_in,
+                       nt_errstr(status) ));
+               return status;
+       }
+
+       if (is_fake_file_path(name_in)) {
+               SMB_STRUCT_STAT st;
+               ZERO_STRUCT(st);
+               st.st_ex_nlink = 1;
+               status = create_synthetic_smb_fname_split(ctx,
+                                                         name_in,
+                                                         &st,
+                                                         pp_smb_fname);
+               return status;
+       }
+
+       /*
+        * If the caller conditionally allows wildcard lookups, only add the
+        * always allow if the path actually does contain a wildcard.
+        */
+       if (ucf_flags & UCF_COND_ALLOW_WCARD_LCOMP &&
+           ppath_contains_wcard != NULL && *ppath_contains_wcard) {
+               ucf_flags |= UCF_ALWAYS_ALLOW_WCARD_LCOMP;
+       }
+
+       status = unix_convert(ctx, conn, fname, pp_smb_fname, ucf_flags);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10,("filename_convert: unix_convert failed "
+                       "for name %s with %s\n",
+                       fname,
+                       nt_errstr(status) ));
+               return status;
+       }
+
+       status = check_name(conn, (*pp_smb_fname)->base_name);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(3,("filename_convert: check_name failed "
+                       "for name %s with %s\n",
+                       smb_fname_str_dbg(*pp_smb_fname),
+                       nt_errstr(status) ));
+               TALLOC_FREE(*pp_smb_fname);
+               return status;
+       }
+
+       return status;
+}