Revert "s3: Make the implicit reference to Protocol in is_in_path() explicit"

This reverts commit f7b4151a64d8c6851e62255a7139fd00a5fc63a3.

5 files changed, 7 insertions, 13 deletions

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 137048d4d4..5ce4a7b099 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1215,8 +1215,7 @@ bool is_visible_file(connection_struct *conn, const char *dir_path,
 	}
 
 	/* If it's a vetoed file, pretend it doesn't even exist */
-	if (use_veto && is_in_path(name, conn->veto_list, get_Protocol(),
-				   conn->case_sensitive)) {
+	if (use_veto && IS_VETO_PATH(conn, name)) {
 		DEBUG(10,("is_visible_file: file %s is vetoed.\n", name ));
 		return False;
 	}
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 928d48c351..0f31973675 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -455,8 +455,7 @@ uint32 dos_mode_msdfs(connection_struct *conn,
 	/* Optimization : Only call is_hidden_path if it's not already
 	   hidden. */
 	if (!(result & aHIDDEN) &&
-	    is_in_path(smb_fname->base_name, conn->hide_list, get_Protocol(),
-		       conn->case_sensitive)) {
+	    IS_HIDDEN_PATH(conn, smb_fname->base_name)) {
 		result |= aHIDDEN;
 	}
 
@@ -642,8 +641,7 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname)
 	/* Optimization : Only call is_hidden_path if it's not already
 	   hidden. */
 	if (!(result & aHIDDEN) &&
-	    is_in_path(smb_fname->base_name, conn->hide_list, get_Protocol(),
-		       conn->case_sensitive)) {
+	    IS_HIDDEN_PATH(conn, smb_fname->base_name)) {
 		result |= aHIDDEN;
 	}
 
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 719ab6a395..5d6661df2a 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -780,8 +780,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
 
 NTSTATUS check_name(connection_struct *conn, const char *name)
 {
-	if (is_in_path(name, conn->veto_list, get_Protocol(),
-		       conn->case_sensitive)) {
+	if (IS_VETO_PATH(conn, name))  {
 		/* Is it not dot or dot dot. */
 		if (!((name[0] == '.') && (!name[1] ||
 					(name[1] == '.' && !name[2])))) {
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 3ae6a8af29..911e8fde68 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -611,7 +611,7 @@ static NTSTATUS open_file(files_struct *fsp,
 	fsp->is_directory = False;
 	if (conn->aio_write_behind_list &&
 	    is_in_path(smb_fname->base_name, conn->aio_write_behind_list,
-		       get_Protocol(), conn->case_sensitive)) {
+		       conn->case_sensitive)) {
 		fsp->aio_write_behind = True;
 	}
 	status = fsp_set_smb_fname(fsp, smb_fname);
@@ -1569,8 +1569,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 
 	/* ignore any oplock requests if oplocks are disabled */
 	if (!lp_oplocks(SNUM(conn)) || global_client_failed_oplock_break ||
-	    is_in_path(smb_fname->base_name, conn->veto_oplock_list,
-		       get_Protocol(), conn->case_sensitive)) {
+	    IS_VETO_OPLOCK_PATH(conn, smb_fname->base_name)) {
 		/* Mask off everything except the private Samba bits. */
 		oplock_request &= SAMBA_PRIVATE_OPLOCK_MASK;
 	}
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 4d7166fe9f..a113a9d982 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -5445,8 +5445,7 @@ NTSTATUS rmdir_internals(TALLOC_CTX *ctx,
 				TALLOC_FREE(talloced);
 				continue;
 			}
-			if(!is_in_path(dname, conn->veto_list, get_Protocol(),
-				       conn->case_sensitive)) {
+			if(!IS_VETO_PATH(conn, dname)) {
 				TALLOC_FREE(dir_hnd);
 				TALLOC_FREE(talloced);
 				errno = ENOTEMPTY;