smbd: factor out unix_convert_step_stat() from unix_convert_step()

The diff looks more complicated that it is: everything in the new
unix_convert_step_stat() is moved *as is* from unix_convert_step() without
further changes.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 1b886cd7c50320f74f0c89694bd90be4037e300f..ed6a5c95c41da263738ae246275028f021462f07 100644 (file)
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -476,54 +476,10 @@ struct uc_state {
        bool done;
 };
 
-static NTSTATUS unix_convert_step(struct uc_state *state)
+static NTSTATUS unix_convert_step_stat(struct uc_state *state)
 {
        int ret;
 
-       /*
-        * Pinpoint the end of this section of the filename.
-        */
-       /* mb safe. '/' can't be in any encoded char. */
-       state->end = strchr(state->name, '/');
-
-       /*
-        * Chop the name at this point.
-        */
-       if (state->end) {
-               *state->end = 0;
-       }
-
-       /* The name cannot have a component of "." */
-
-       if (ISDOT(state->name)) {
-               if (!state->end)  {
-                       /* Error code at the end of a pathname. */
-                       return NT_STATUS_OBJECT_NAME_INVALID;
-               }
-               return determine_path_error(state->end+1,
-                                           state->allow_wcard_last_component,
-                                           state->posix_pathnames);
-       }
-
-       /* The name cannot have a wildcard if it's not
-          the last component. */
-
-       if (!state->posix_pathnames) {
-               state->name_has_wildcard = ms_has_wild(state->name);
-       }
-
-       /* Wildcards never valid within a pathname. */
-       if (state->name_has_wildcard && state->end) {
-               return NT_STATUS_OBJECT_NAME_INVALID;
-       }
-
-       /* Skip the stat call if it's a wildcard end. */
-       if (state->name_has_wildcard) {
-               DBG_DEBUG("Wildcard [%s]\n", state->name);
-               state->done = true;
-               return NT_STATUS_OK;
-       }
-
        /*
         * Check if the name exists up to this point.
         */
@@ -533,7 +489,6 @@ static NTSTATUS unix_convert_step(struct uc_state *state)
        } else {
                ret = SMB_VFS_STAT(state->conn, state->smb_fname);
        }
-
        if (ret == 0) {
                /*
                 * It exists. it must either be a directory or this must
@@ -820,6 +775,62 @@ static NTSTATUS unix_convert_step(struct uc_state *state)
                TALLOC_FREE(found_name);
        } /* end else */
 
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS unix_convert_step(struct uc_state *state)
+{
+       NTSTATUS status;
+
+       /*
+        * Pinpoint the end of this section of the filename.
+        */
+       /* mb safe. '/' can't be in any encoded char. */
+       state->end = strchr(state->name, '/');
+
+       /*
+        * Chop the name at this point.
+        */
+       if (state->end) {
+               *state->end = 0;
+       }
+
+       /* The name cannot have a component of "." */
+
+       if (ISDOT(state->name)) {
+               if (!state->end)  {
+                       /* Error code at the end of a pathname. */
+                       return NT_STATUS_OBJECT_NAME_INVALID;
+               }
+               return determine_path_error(state->end+1,
+                                           state->allow_wcard_last_component,
+                                           state->posix_pathnames);
+       }
+
+       /* The name cannot have a wildcard if it's not
+          the last component. */
+
+       if (!state->posix_pathnames) {
+               state->name_has_wildcard = ms_has_wild(state->name);
+       }
+
+       /* Wildcards never valid within a pathname. */
+       if (state->name_has_wildcard && state->end) {
+               return NT_STATUS_OBJECT_NAME_INVALID;
+       }
+
+       /* Skip the stat call if it's a wildcard end. */
+       if (state->name_has_wildcard) {
+               DBG_DEBUG("Wildcard [%s]\n", state->name);
+               state->done = true;
+               return NT_STATUS_OK;
+       }
+
+       status = unix_convert_step_stat(state);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
        /*
         * Add to the dirpath that we have resolved so far.
         */