From 10324b177ed2c5de07039f035905b8272f51fbf7 Mon Sep 17 00:00:00 2001
From: Tim Prouty <tprouty@samba.org>
Date: Fri, 24 Jul 2009 12:13:07 -0700
Subject: s3: Allow filename_convert() to pass through unix_convert_flags and
 let the caller know if the path has a wildcard

This also eliminates the need for resolve_dfspath().
---
 source3/smbd/trans2.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'source3/smbd/trans2.c')

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 856fd9432d..6a7b1f8b32 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1024,6 +1024,8 @@ static void call_trans2open(connection_struct *conn,
 				conn,
 				req->flags2 & FLAGS2_DFS_PATHNAMES,
 				fname,
+				0,
+				NULL,
 				&smb_fname);
 	if (!NT_STATUS_IS_OK(status)) {
 		if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
@@ -4891,6 +4893,8 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
 					conn,
 					req->flags2 & FLAGS2_DFS_PATHNAMES,
 					fname,
+					0,
+					NULL,
 					&smb_fname);
 		if (!NT_STATUS_IS_OK(status)) {
 			if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
@@ -5660,6 +5664,8 @@ static NTSTATUS smb_set_file_unix_hlink(connection_struct *conn,
 				conn,
 				req->flags2 & FLAGS2_DFS_PATHNAMES,
 				oldname,
+				0,
+				NULL,
 				&smb_fname_old);
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
@@ -7437,6 +7443,8 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
 		status = filename_convert(req, conn,
 					 req->flags2 & FLAGS2_DFS_PATHNAMES,
 					 fname,
+					 0,
+					 NULL,
 					 &smb_fname);
 		if (!NT_STATUS_IS_OK(status)) {
 			if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
@@ -7558,6 +7566,8 @@ static void call_trans2mkdir(connection_struct *conn, struct smb_request *req,
 				conn,
 				req->flags2 & FLAGS2_DFS_PATHNAMES,
 				directory,
+				0,
+				NULL,
 				&smb_dname);
 
 	if (!NT_STATUS_IS_OK(status)) {
-- 
cgit