smbd: rename open_internal_dirfsp_at() to open_internal_dirfsp()

Having removed the unused dirfsp parameter this is not an AT function. Security
is provided by symlink safe fd_open().

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

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 2660718b29b44a1acb8432bffc7bad6b31650362..51cd22d6c5a0cd24db0f87a6a2107f735d7221a5 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1369,10 +1369,10 @@ struct smb_Dir *OpenDir(TALLOC_CTX *mem_ctx,
        struct smb_Dir *dir_hnd = NULL;
        NTSTATUS status;
 
-       status = open_internal_dirfsp_at(conn,
-                                        smb_dname,
-                                        O_RDONLY,
-                                        &fsp);
+       status = open_internal_dirfsp(conn,
+                                     smb_dname,
+                                     O_RDONLY,
+                                     &fsp);
        if (!NT_STATUS_IS_OK(status)) {
                return NULL;
        }

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 9f02ddbc6c0c5baf1ce5ecae685e7601c4fb53cd..2106d1accba0a7c66831e9c1c5929e0a14a95d93 100644 (file)
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -219,10 +219,10 @@ NTSTATUS create_internal_dirfsp_at(connection_struct *conn,
 /*
  * Open an internal fsp for an *existing* directory.
  */
-NTSTATUS open_internal_dirfsp_at(connection_struct *conn,
-                                const struct smb_filename *smb_dname,
-                                int open_flags,
-                                struct files_struct **_fsp)
+NTSTATUS open_internal_dirfsp(connection_struct *conn,
+                             const struct smb_filename *smb_dname,
+                             int open_flags,
+                             struct files_struct **_fsp)
 {
        struct files_struct *fsp = NULL;
        NTSTATUS status;

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 1ae80c8da3d51ce387644c60abd31147ab057ce3..943f9729d67734dadf62238c8a08e2049f02dca2 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -451,10 +451,10 @@ NTSTATUS create_internal_dirfsp_at(connection_struct *conn,
                                   const struct smb_filename *smb_dname,
                                   struct files_struct **_fsp);
 
-NTSTATUS open_internal_dirfsp_at(connection_struct *conn,
-                                const struct smb_filename *smb_dname,
-                                int open_flags,
-                                struct files_struct **_fsp);
+NTSTATUS open_internal_dirfsp(connection_struct *conn,
+                             const struct smb_filename *smb_dname,
+                             int open_flags,
+                             struct files_struct **_fsp);
 
 /* The following definitions come from smbd/ipc.c  */