Rename parent_dirname_talloc() to parent_dirname()

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 437a1d545afc5120ee8368a3f22c00c21e500f3d..be34bb0e6599cbf80c69d33b490898a4460f55cb 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1230,8 +1230,8 @@ char *modules_path(const char *name);
 char *data_path(const char *name);
 char *state_path(const char *name);
 const char *shlib_ext(void);
-bool parent_dirname_talloc(TALLOC_CTX *mem_ctx, const char *dir,
-                          char **parent, const char **name);
+bool parent_dirname(TALLOC_CTX *mem_ctx, const char *dir, char **parent,
+                   const char **name);
 bool ms_has_wild(const char *s);
 bool ms_has_wild_w(const smb_ucs2_t *s);
 bool mask_match(const char *string, const char *pattern, bool is_case_sensitive);

diff --git a/source3/lib/util.c b/source3/lib/util.c
index 2c4cd20f31c52dd54b729ab1cfc7e9692c375175..d00a764c1d543dbb377cfdd13cdb4a4c51717b6e 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2334,8 +2334,8 @@ const char *shlib_ext(void)
  Given a filename - get its directory name
 ********************************************************************/
 
-bool parent_dirname_talloc(TALLOC_CTX *mem_ctx, const char *dir,
-                          char **parent, const char **name)
+bool parent_dirname(TALLOC_CTX *mem_ctx, const char *dir, char **parent,
+                   const char **name)
 {
        char *p;
        ptrdiff_t len;

diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c
index d0310d017486c8982919ce2348146d93326621f2..a4a317d9053ad27b3a971a49ed2830ac52494151 100644 (file)
--- a/source3/modules/onefs_open.c
+++ b/source3/modules/onefs_open.c
@@ -462,8 +462,7 @@ NTSTATUS onefs_open_file_ntcreate(connection_struct *conn,
                return print_fsp_open(req, conn, fname, req->vuid, fsp);
        }
 
-       if (!parent_dirname_talloc(talloc_tos(), fname, &parent_dir,
-                                  &newname)) {
+       if (!parent_dirname(talloc_tos(), fname, &parent_dir, &newname)) {
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -1339,8 +1338,7 @@ static NTSTATUS onefs_open_directory(connection_struct *conn,
        }
 
        /* Get parent dirname */
-       if (!parent_dirname_talloc(talloc_tos(), fname, &parent_dir,
-                                  &dirname)) {
+       if (!parent_dirname(talloc_tos(), fname, &parent_dir, &dirname)) {
                return NT_STATUS_NO_MEMORY;
        }
 

diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 9cb887ae5184020997f9f30bbaba099b91d0bb7b..3d140e34c247f6a3d7b81cb47ba887cefb99ba97 100644 (file)
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -433,10 +433,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
        size_t size;
        char *parent_name;
 
-       if (!parent_dirname_talloc(ctx,
-                               fname,
-                               &parent_name,
-                               NULL)) {
+       if (!parent_dirname(ctx, fname, &parent_name, NULL)) {
                return NT_STATUS_NO_MEMORY;
        }
 

diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index 3c8f241ad962dc146d8303ec463112a977eb588c..7c78b506f094392ea3d8e4642b8da82f292a27df 100644 (file)
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -328,10 +328,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
        size_t size;
        char *parent_name;
 
-       if (!parent_dirname_talloc(ctx,
-                               fname,
-                               &parent_name,
-                               NULL)) {
+       if (!parent_dirname(ctx, fname, &parent_name, NULL)) {
                return NT_STATUS_NO_MEMORY;
        }
 

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 3171d3c5ca5f86b71a9a7d33a2a9ada4c018b5e7..61e1deb81e2244caa5e5d6e74fa9513d1647bd47 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -155,7 +155,7 @@ static int vfswrap_mkdir(vfs_handle_struct *handle,  const char *path, mode_t mo
        START_PROFILE(syscall_mkdir);
 
        if (lp_inherit_acls(SNUM(handle->conn))
-           && parent_dirname_talloc(talloc_tos(), path, &parent, NULL)
+           && parent_dirname(talloc_tos(), path, &parent, NULL)
            && (has_dacl = directory_has_default_acl(handle->conn, parent)))
                mode = 0777;
 

diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index c535bc7fd8907fd63d750a690212a5d2b7e1ae32..d44e63a89a9005fda1c1fae2919c9aa4859f39b9 100644 (file)
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -66,10 +66,7 @@ bool can_delete_file_in_directory(connection_struct *conn, const char *fname)
        }
 
        /* Get the parent directory permission mask and owners. */
-       if (!parent_dirname_talloc(ctx,
-                               fname,
-                               &dname,
-                               NULL)) {
+       if (!parent_dirname(ctx, fname, &dname, NULL)) {
                return False;
        }
        if(SMB_VFS_STAT(conn, dname, &sbuf) != 0) {

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index c9874f6a48139ac134c03cdb69590fe68ee72ff2..9bfc5664101aeb8f59741a20cf420c8608569370 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1256,7 +1256,7 @@ static NTSTATUS copy_internals(TALLOC_CTX *ctx,
        /* Grrr. We have to do this as open_file_ntcreate adds aARCH when it
           creates the file. This isn't the correct thing to do in the copy
           case. JRA */
-       if (!parent_dirname_talloc(talloc_tos(), newname, &parent, NULL)) {
+       if (!parent_dirname(talloc_tos(), newname, &parent, NULL)) {
                return NT_STATUS_NO_MEMORY;
        }
        file_set_dosmode(conn, newname, fattr, &sbuf2, parent, false);

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 8fe20f9cca8aff027f068a7e4f9e1e179602d63a..03d994f0831c18eaec4bc7bafd3ac6cfbcc1dfde 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1363,8 +1363,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                return print_fsp_open(req, conn, fname, req->vuid, fsp, psbuf);
        }
 
-       if (!parent_dirname_talloc(talloc_tos(), fname, &parent_dir,
-                                  &newname)) {
+       if (!parent_dirname(talloc_tos(), fname, &parent_dir, &newname)) {
                return NT_STATUS_NO_MEMORY;
        }
 
@@ -2190,8 +2189,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
                return status;
        }
 
-       if (!parent_dirname_talloc(talloc_tos(), name, &parent_dir,
-                                  &dirname)) {
+       if (!parent_dirname(talloc_tos(), name, &parent_dir, &dirname)) {
                return NT_STATUS_NO_MEMORY;
        }
 

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index b184279259d37840632160fca688993430b991d3..8fe7a9abe912938b42871602b1047e02ce658a68 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3241,10 +3241,7 @@ NTSTATUS append_parent_acl(files_struct *fsp,
                return NT_STATUS_NO_MEMORY;
        }
 
-       if (!parent_dirname_talloc(mem_ctx,
-                               fsp->fsp_name,
-                               &parent_name,
-                               NULL)) {
+       if (!parent_dirname(mem_ctx, fsp->fsp_name, &parent_name, NULL)) {
                return NT_STATUS_NO_MEMORY;
        }
 

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 8f9edfe0ca3e3eaeb595102dadec0f6b76347043..2133a30dc651c7cf5cc1d653488aabaa6614a1bb 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -5396,8 +5396,8 @@ static void notify_rename(connection_struct *conn, bool is_dir,
        mask = is_dir ? FILE_NOTIFY_CHANGE_DIR_NAME
                : FILE_NOTIFY_CHANGE_FILE_NAME;
 
-       if (!parent_dirname_talloc(NULL, oldpath, &olddir, &oldname)
-           || !parent_dirname_talloc(NULL, newpath, &newdir, &newname)) {
+       if (!parent_dirname(talloc_tos(), oldpath, &olddir, &oldname)
+           || !parent_dirname(talloc_tos(), newpath, &newdir, &newname)) {
                TALLOC_FREE(olddir);
                return;
        }

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index abc5888ba04bc95ca7025555de772d2d9ff3c101..5abfffd61886980c4cd63c0865ff6ad3cf5c2289 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -5983,8 +5983,7 @@ static NTSTATUS smb_unix_mknod(connection_struct *conn,
 
        if (lp_inherit_perms(SNUM(conn))) {
                char *parent;
-               if (!parent_dirname_talloc(talloc_tos(), fname, &parent,
-                                          NULL)) {
+               if (!parent_dirname(talloc_tos(), fname, &parent, NULL)) {
                        return NT_STATUS_NO_MEMORY;
                }
                inherit_access_posix_acl(conn, parent, fname, unixmode);