From: Ralph Boehme <slow@samba.org>
Date: Fri, 15 May 2020 13:14:26 +0000 (+0200)
Subject: smbd: rename open_internal_dirfsp_at() to open_internal_dirfsp()
X-Git-Tag: ldb-2.2.0~436
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84cf205ff4358a2cd58053e05bf165801ebf16f6;p=thirdparty%2Fsamba.git

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 2660718b29b..51cd22d6c5a 100644
--- 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 9f02ddbc6c0..2106d1accba 100644
--- 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 1ae80c8da3d..943f9729d67 100644
--- 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  */