s3:smbd: split out smbd_do_qfilepathinfo() from call_trans2qfilepathinfo()

This prepares SMB2 GetInfo.

metze

1 files changed, 504 insertions, 459 deletions

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b7591c4bbb..c9e7e4bbfb 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3878,296 +3878,52 @@ static void call_trans2qpipeinfo(connection_struct *conn,
 	return;
 }
 
-/****************************************************************************
- Reply to a TRANS2_QFILEPATHINFO or TRANSACT2_QFILEINFO (query file info by
- file name or file id).
-****************************************************************************/
-
-static void call_trans2qfilepathinfo(connection_struct *conn,
-				     struct smb_request *req,
-				     unsigned int tran_call,
-				     char **pparams, int total_params,
-				     char **ppdata, int total_data,
-				     unsigned int max_data_bytes)
+static NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
+				      TALLOC_CTX *mem_ctx,
+				      uint16_t info_level,
+				      files_struct *fsp,
+				      const struct smb_filename *smb_fname,
+				      bool delete_pending,
+				      struct timespec write_time_ts,
+				      bool ms_dfs_link,
+				      struct ea_list *ea_list,
+				      int lock_data_count,
+				      char *lock_data,
+				      uint16_t flags2,
+				      unsigned int max_data_bytes,
+				      char **ppdata,
+				      unsigned int *pdata_size)
 {
-	char *params = *pparams;
 	char *pdata = *ppdata;
 	char *dstart, *dend;
-	uint16 info_level;
-	int mode=0;
-	int nlink;
-	SMB_OFF_T file_size=0;
-	uint64_t allocation_size=0;
-	unsigned int data_size = 0;
-	unsigned int param_size = 2;
+	unsigned int data_size;
+	struct timespec create_time_ts, mtime_ts, atime_ts;
+	time_t create_time, mtime, atime;
 	SMB_STRUCT_STAT sbuf;
-	char *dos_fname = NULL;
-	char *fname = NULL;
-	struct smb_filename *smb_fname = NULL;
-	char *fullpathname;
-	char *base_name;
 	char *p;
-	SMB_OFF_T pos = 0;
-	bool delete_pending = False;
-	int len;
-	time_t create_time, mtime, atime;
-	struct timespec create_time_ts, mtime_ts, atime_ts;
-	struct timespec write_time_ts;
-	files_struct *fsp = NULL;
-	struct file_id fileid;
-	struct ea_list *ea_list = NULL;
-	char *lock_data = NULL;
-	bool ms_dfs_link = false;
-	TALLOC_CTX *ctx = talloc_tos();
-	NTSTATUS status = NT_STATUS_OK;
-
-	if (!params) {
-		reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-		return;
-	}
-
-	ZERO_STRUCT(write_time_ts);
-
-	if (tran_call == TRANSACT2_QFILEINFO) {
-		if (total_params < 4) {
-			reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-			return;
-		}
-
-		if (IS_IPC(conn)) {
-			call_trans2qpipeinfo(conn, req,	tran_call,
-					     pparams, total_params,
-					     ppdata, total_data,
-					     max_data_bytes);
-			return;
-		}
-
-		fsp = file_fsp(req, SVAL(params,0));
-		info_level = SVAL(params,2);
-
-		DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QFILEINFO: level = %d\n", info_level));
-
-		if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
-			reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-			return;
-		}
-
-		/* Initial check for valid fsp ptr. */
-		if (!check_fsp_open(conn, req, fsp)) {
-			return;
-		}
-
-		fname = talloc_strdup(talloc_tos(),fsp->fsp_name);
-		if (!fname) {
-			reply_nterror(req, NT_STATUS_NO_MEMORY);
-			return;
-		}
-
-		status = create_synthetic_smb_fname_split(talloc_tos(), fname,
-							  NULL, &smb_fname);
-		if (!NT_STATUS_IS_OK(status)) {
-			reply_nterror(req, status);
-			return;
-		}
-
-		if(fsp->fake_file_handle) {
-			/*
-			 * This is actually for the QUOTA_FAKE_FILE --metze
-			 */
-
-			/* We know this name is ok, it's already passed the checks. */
-
-		} else if(fsp && (fsp->is_directory || fsp->fh->fd == -1)) {
-			/*
-			 * This is actually a QFILEINFO on a directory
-			 * handle (returned from an NT SMB). NT5.0 seems
-			 * to do this call. JRA.
-			 */
-
-			if (INFO_LEVEL_IS_UNIX(info_level)) {
-				/* Always do lstat for UNIX calls. */
-				if (SMB_VFS_LSTAT(conn, smb_fname)) {
-					DEBUG(3,("call_trans2qfilepathinfo: "
-						 "SMB_VFS_LSTAT of %s failed "
-						 "(%s)\n",
-						 smb_fname_str_dbg(smb_fname),
-						 strerror(errno)));
-					reply_nterror(req,map_nt_error_from_unix(errno));
-					return;
-				}
-			} else if (SMB_VFS_STAT(conn, smb_fname)) {
-				DEBUG(3,("call_trans2qfilepathinfo: "
-					 "SMB_VFS_STAT of %s failed (%s)\n",
-					 smb_fname_str_dbg(smb_fname),
-					 strerror(errno)));
-				reply_nterror(req, map_nt_error_from_unix(errno));
-				return;
-			}
-
-			fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
-			get_file_infos(fileid, &delete_pending, &write_time_ts);
-		} else {
-			/*
-			 * Original code - this is an open file.
-			 */
-			if (!check_fsp(conn, req, fsp)) {
-				return;
-			}
-
-			if (SMB_VFS_FSTAT(fsp, &smb_fname->st) != 0) {
-				DEBUG(3, ("fstat of fnum %d failed (%s)\n",
-					  fsp->fnum, strerror(errno)));
-				reply_nterror(req, map_nt_error_from_unix(errno));
-				return;
-			}
-			pos = fsp->fh->position_information;
-			fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
-			get_file_infos(fileid, &delete_pending, &write_time_ts);
-		}
-
-	} else {
-		/* qpathinfo */
-		if (total_params < 7) {
-			reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
-			return;
-		}
-
-		info_level = SVAL(params,0);
-
-		DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
-
-		if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
-			reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-			return;
-		}
-
-		srvstr_get_path(ctx, params, req->flags2, &fname, &params[6],
-				total_params - 6,
-				STR_TERMINATE, &status);
-		if (!NT_STATUS_IS_OK(status)) {
-			reply_nterror(req, status);
-			return;
-		}
-
-		status = filename_convert(ctx,
-					conn,
-					req->flags2 & FLAGS2_DFS_PATHNAMES,
-					fname,
-					&smb_fname,
-					&fname);
-		if (!NT_STATUS_IS_OK(status)) {
-			if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
-				reply_botherror(req,
-						NT_STATUS_PATH_NOT_COVERED,
-						ERRSRV, ERRbadpath);
-				return;
-			}
-			reply_nterror(req, status);
-			return;
-		}
-
-		/* If this is a stream, check if there is a delete_pending. */
-		if ((conn->fs_capabilities & FILE_NAMED_STREAMS)
-		    && is_ntfs_stream_smb_fname(smb_fname)) {
-			struct smb_filename *smb_fname_base = NULL;
-
-			/* Create an smb_filename with stream_name == NULL. */
-			status =
-			    create_synthetic_smb_fname(talloc_tos(),
-						       smb_fname->base_name,
-						       NULL, NULL,
-						       &smb_fname_base);
-			if (!NT_STATUS_IS_OK(status)) {
-				reply_nterror(req, status);
-				return;
-			}
-
-			if (INFO_LEVEL_IS_UNIX(info_level)) {
-				/* Always do lstat for UNIX calls. */
-				if (SMB_VFS_LSTAT(conn, smb_fname_base) != 0) {
-					DEBUG(3,("call_trans2qfilepathinfo: "
-						 "SMB_VFS_LSTAT of %s failed "
-						 "(%s)\n",
-						 smb_fname_str_dbg(smb_fname_base),
-						 strerror(errno)));
-					reply_nterror(req,map_nt_error_from_unix(errno));
-					TALLOC_FREE(smb_fname_base);
-					return;
-				}
-			} else {
-				if (SMB_VFS_STAT(conn, smb_fname_base) != 0) {
-					DEBUG(3,("call_trans2qfilepathinfo: "
-						 "fileinfo of %s failed "
-						 "(%s)\n",
-						 smb_fname_str_dbg(smb_fname_base),
-						 strerror(errno)));
-					reply_nterror(req,map_nt_error_from_unix(errno));
-					TALLOC_FREE(smb_fname_base);
-					return;
-				}
-			}
-
-			fileid = vfs_file_id_from_sbuf(conn,
-						       &smb_fname_base->st);
-			TALLOC_FREE(smb_fname_base);
-			get_file_infos(fileid, &delete_pending, NULL);
-			if (delete_pending) {
-				reply_nterror(req, NT_STATUS_DELETE_PENDING);
-				return;
-			}
-		}
-
-		if (INFO_LEVEL_IS_UNIX(info_level)) {
-			/* Always do lstat for UNIX calls. */
-			if (SMB_VFS_LSTAT(conn, smb_fname)) {
-				DEBUG(3,("call_trans2qfilepathinfo: "
-					 "SMB_VFS_LSTAT of %s failed (%s)\n",
-					 smb_fname_str_dbg(smb_fname),
-					 strerror(errno)));
-				reply_nterror(req,map_nt_error_from_unix(errno));
-				return;
-			}
-
-		} else if (!VALID_STAT(smb_fname->st) &&
-			   SMB_VFS_STAT(conn, smb_fname) &&
-			   (info_level != SMB_INFO_IS_NAME_VALID)) {
-			ms_dfs_link = check_msdfs_link(conn, fname,
-						       &smb_fname->st);
-
-			if (!ms_dfs_link) {
-				DEBUG(3,("call_trans2qfilepathinfo: "
-					 "SMB_VFS_STAT of %s failed (%s)\n",
-					 smb_fname_str_dbg(smb_fname),
-					 strerror(errno)));
-				reply_nterror(req,map_nt_error_from_unix(errno));
-				return;
-			}
-		}
-
-		fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
-		get_file_infos(fileid, &delete_pending, &write_time_ts);
-		if (delete_pending) {
-			reply_nterror(req, NT_STATUS_DELETE_PENDING);
-			return;
-		}
-	}
+	char *fname;
+	char *base_name;
+	char *dos_fname;
+	int mode;
+	int nlink;
+	NTSTATUS status;
+	uint64_t file_size = 0;
+	uint64_t pos = 0;
+	uint64_t allocation_size = 0;
 
-	/* Set sbuf for use below. */
 	sbuf = smb_fname->st;
 
 	if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
-		reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-		return;
+		return NT_STATUS_INVALID_LEVEL;
 	}
 
-	DEBUG(3,("call_trans2qfilepathinfo %s (fnum = %d) level=%d call=%d total_data=%d\n",
-		fname,fsp ? fsp->fnum : -1, info_level,tran_call,total_data));
+	status = get_full_smb_filename(mem_ctx, smb_fname, &fname);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
 
-	p = strrchr_m(smb_fname->base_name,'/');
-	if (!p)
-		base_name = smb_fname->base_name;
-	else
-		base_name = p+1;
+	DEBUG(5,("smbd_do_qfilepathinfo: %s (fnum = %d) level=%d max_data=%u\n",
+		fname, fsp ? fsp->fnum : -1, info_level, max_data_bytes));
 
 	if (ms_dfs_link) {
 		mode = dos_mode_msdfs(conn, smb_fname);
@@ -4187,102 +3943,15 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
 		nlink -= 1;
 	}
 
-	fullpathname = fname;
-	if (!(mode & aDIR))
-		file_size = get_file_size_stat(&sbuf);
-
-	/* Pull out any data sent here before we realloc. */
-	switch (info_level) {
-		case SMB_INFO_QUERY_EAS_FROM_LIST:
-		{
-			/* Pull any EA list from the data portion. */
-			uint32 ea_size;
-
-			if (total_data < 4) {
-				reply_nterror(
-					req, NT_STATUS_INVALID_PARAMETER);
-				return;
-			}
-			ea_size = IVAL(pdata,0);
-
-			if (total_data > 0 && ea_size != total_data) {
-				DEBUG(4,("call_trans2qfilepathinfo: Rejecting EA request with incorrect \
-total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pdata,0) ));
-				reply_nterror(
-					req, NT_STATUS_INVALID_PARAMETER);
-				return;
-			}
-
-			if (!lp_ea_support(SNUM(conn))) {
-				reply_doserror(req, ERRDOS,
-					       ERReasnotsupported);
-				return;
-			}
-
-			/* Pull out the list of names. */
-			ea_list = read_ea_name_list(ctx, pdata + 4, ea_size - 4);
-			if (!ea_list) {
-				reply_nterror(
-					req, NT_STATUS_INVALID_PARAMETER);
-				return;
-			}
-			break;
-		}
-
-		case SMB_QUERY_POSIX_LOCK:
-		{
-			if (fsp == NULL || fsp->fh->fd == -1) {
-				reply_nterror(req, NT_STATUS_INVALID_HANDLE);
-				return;
-			}
-
-			if (total_data != POSIX_LOCK_DATA_SIZE) {
-				reply_nterror(
-					req, NT_STATUS_INVALID_PARAMETER);
-				return;
-			}
-
-			/* Copy the lock range data. */
-			lock_data = (char *)TALLOC_MEMDUP(
-				ctx, pdata, total_data);
-			if (!lock_data) {
-				reply_nterror(req, NT_STATUS_NO_MEMORY);
-				return;
-			}
-		}
-		default:
-			break;
-	}
-
-	*pparams = (char *)SMB_REALLOC(*pparams,2);
-	if (*pparams == NULL) {
-		reply_nterror(req, NT_STATUS_NO_MEMORY);
-		return;
-	}
-	params = *pparams;
-	SSVAL(params,0,0);
 	data_size = max_data_bytes + DIR_ENTRY_SAFETY_MARGIN;
 	*ppdata = (char *)SMB_REALLOC(*ppdata, data_size); 
-	if (*ppdata == NULL ) {
-		reply_nterror(req, NT_STATUS_NO_MEMORY);
-		return;
+	if (*ppdata == NULL) {
+		return NT_STATUS_NO_MEMORY;
 	}
 	pdata = *ppdata;
 	dstart = pdata;
 	dend = dstart + data_size - 1;
 
-	allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn,fsp,&sbuf);
-
-	if (!fsp) {
-		/* Do we have this path open ? */
-		files_struct *fsp1;
-		fileid = vfs_file_id_from_sbuf(conn, &sbuf);
-		fsp1 = file_find_di_first(fileid);
-		if (fsp1 && fsp1->initial_allocation_size) {
-			allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn, fsp1, &sbuf);
-		}
-	}
-
 	if (!null_timespec(write_time_ts) && !INFO_LEVEL_IS_UNIX(info_level)) {
 		update_stat_ex_mtime(&sbuf, write_time_ts);
 	}
@@ -4301,28 +3970,52 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 	mtime = convert_timespec_to_time_t(mtime_ts);
 	atime = convert_timespec_to_time_t(atime_ts);
 
+	p = strrchr_m(smb_fname->base_name,'/');
+	if (!p)
+		base_name = smb_fname->base_name;
+	else
+		base_name = p+1;
+
 	/* NT expects the name to be in an exact form of the *full*
 	   filename. See the trans2 torture test */
 	if (ISDOT(base_name)) {
-		dos_fname = talloc_strdup(ctx, "\\");
+		dos_fname = talloc_strdup(mem_ctx, "\\");
 		if (!dos_fname) {
-			reply_nterror(req, NT_STATUS_NO_MEMORY);
-			return;
+			return NT_STATUS_NO_MEMORY;
 		}
 	} else {
-		dos_fname = talloc_asprintf(ctx,
+		dos_fname = talloc_asprintf(mem_ctx,
 				"\\%s",
 				fname);
 		if (!dos_fname) {
-			reply_nterror(req, NT_STATUS_NO_MEMORY);
-			return;
+			return NT_STATUS_NO_MEMORY;
 		}
 		string_replace(dos_fname, '/', '\\');
 	}
 
+	allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn, fsp, &sbuf);
+
+	if (!fsp) {
+		/* Do we have this path open ? */
+		files_struct *fsp1;
+		struct file_id fileid = vfs_file_id_from_sbuf(conn, &sbuf);
+		fsp1 = file_find_di_first(fileid);
+		if (fsp1 && fsp1->initial_allocation_size) {
+			allocation_size = SMB_VFS_GET_ALLOC_SIZE(conn, fsp1, &sbuf);
+		}
+	}
+
+	if (!(mode & aDIR)) {
+		file_size = get_file_size_stat(&sbuf);
+	}
+
+	if (fsp && fsp->fh) {
+		pos = fsp->fh->position_information;
+	}
+
 	switch (info_level) {
 		case SMB_INFO_STANDARD:
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_STANDARD\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_INFO_STANDARD\n"));
 			data_size = 22;
 			srv_put_dos_date2(pdata,l1_fdateCreation,create_time);
 			srv_put_dos_date2(pdata,l1_fdateLastAccess,atime);
@@ -4335,7 +4028,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 		case SMB_INFO_QUERY_EA_SIZE:
 		{
 			unsigned int ea_size = estimate_ea_size(conn, fsp, fname);
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_QUERY_EA_SIZE\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_INFO_QUERY_EA_SIZE\n"));
 			data_size = 26;
 			srv_put_dos_date2(pdata,0,create_time);
 			srv_put_dos_date2(pdata,4,atime);
@@ -4348,14 +4041,13 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 		}
 
 		case SMB_INFO_IS_NAME_VALID:
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_IS_NAME_VALID\n"));
-			if (tran_call == TRANSACT2_QFILEINFO) {
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_INFO_IS_NAME_VALID\n"));
+			if (fsp) {
 				/* os/2 needs this ? really ?*/
-				reply_doserror(req, ERRDOS, ERRbadfunc);
-				return;
+				return NT_STATUS_DOS(ERRDOS, ERRbadfunc);
 			}
+			/* This is only reached for qpathinfo */
 			data_size = 0;
-			param_size = 0;
 			break;
 
 		case SMB_INFO_QUERY_EAS_FROM_LIST:
@@ -4363,9 +4055,9 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 			size_t total_ea_len = 0;
 			struct ea_list *ea_file_list = NULL;
 
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_QUERY_EAS_FROM_LIST\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_INFO_QUERY_EAS_FROM_LIST\n"));
 
-			ea_file_list = get_ea_list_from_file(ctx, conn, fsp, fname, &total_ea_len);
+			ea_file_list = get_ea_list_from_file(mem_ctx, conn, fsp, fname, &total_ea_len);
 			ea_list = ea_list_union(ea_list, ea_file_list, &total_ea_len);
 
 			if (!ea_list || (total_ea_len > data_size)) {
@@ -4374,7 +4066,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 				break;
 			}
 
-			data_size = fill_ea_buffer(ctx, pdata, data_size, conn, ea_list);
+			data_size = fill_ea_buffer(mem_ctx, pdata, data_size, conn, ea_list);
 			break;
 		}
 
@@ -4383,16 +4075,16 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 			/* We have data_size bytes to put EA's into. */
 			size_t total_ea_len = 0;
 
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_QUERY_ALL_EAS\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_INFO_QUERY_ALL_EAS\n"));
 
-			ea_list = get_ea_list_from_file(ctx, conn, fsp, fname, &total_ea_len);
+			ea_list = get_ea_list_from_file(mem_ctx, conn, fsp, fname, &total_ea_len);
 			if (!ea_list || (total_ea_len > data_size)) {
 				data_size = 4;
 				SIVAL(pdata,0,4);   /* EA List Length must be set to 4 if no EA's. */
 				break;
 			}
 
-			data_size = fill_ea_buffer(ctx, pdata, data_size, conn, ea_list);
+			data_size = fill_ea_buffer(mem_ctx, pdata, data_size, conn, ea_list);
 			break;
 		}
 
@@ -4400,10 +4092,10 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 		case SMB_QUERY_FILE_BASIC_INFO:
 
 			if (info_level == SMB_QUERY_FILE_BASIC_INFO) {
-				DEBUG(10,("call_trans2qfilepathinfo: SMB_QUERY_FILE_BASIC_INFO\n"));
+				DEBUG(10,("smbd_do_qfilepathinfo: SMB_QUERY_FILE_BASIC_INFO\n"));
 				data_size = 36; /* w95 returns 40 bytes not 36 - why ?. */
 			} else {
-				DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_BASIC_INFORMATION\n"));
+				DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_BASIC_INFORMATION\n"));
 				data_size = 40;
 				SIVAL(pdata,36,0);
 			}
@@ -4424,7 +4116,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 		case SMB_FILE_STANDARD_INFORMATION:
 		case SMB_QUERY_FILE_STANDARD_INFO:
 
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_STANDARD_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_STANDARD_INFORMATION\n"));
 			data_size = 24;
 			SOFF_T(pdata,0,allocation_size);
 			SOFF_T(pdata,8,file_size);
@@ -4438,7 +4130,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 		case SMB_QUERY_FILE_EA_INFO:
 		{
 			unsigned int ea_size = estimate_ea_size(conn, fsp, fname);
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_EA_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_EA_INFORMATION\n"));
 			data_size = 4;
 			SIVAL(pdata,0,ea_size);
 			break;
@@ -4448,16 +4140,14 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 		case SMB_QUERY_FILE_ALT_NAME_INFO:
 		case SMB_FILE_ALTERNATE_NAME_INFORMATION:
 		{
+			int len;
 			char mangled_name[13];
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ALTERNATE_NAME_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ALTERNATE_NAME_INFORMATION\n"));
 			if (!name_to_8_3(base_name,mangled_name,
 						True,conn->params)) {
-				reply_nterror(
-					req,
-					NT_STATUS_NO_MEMORY);
-				return;
+				return NT_STATUS_NO_MEMORY;
 			}
-			len = srvstr_push(dstart, req->flags2,
+			len = srvstr_push(dstart, flags2,
 					  pdata+4, mangled_name,
 					  PTR_DIFF(dend, pdata+4),
 					  STR_UNICODE);
@@ -4467,28 +4157,31 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 		}
 
 		case SMB_QUERY_FILE_NAME_INFO:
+		{
+			int len;
 			/*
 			  this must be *exactly* right for ACLs on mapped drives to work
 			 */
-			len = srvstr_push(dstart, req->flags2,
+			len = srvstr_push(dstart, flags2,
 					  pdata+4, dos_fname,
 					  PTR_DIFF(dend, pdata+4),
 					  STR_UNICODE);
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_QUERY_FILE_NAME_INFO\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_QUERY_FILE_NAME_INFO\n"));
 			data_size = 4 + len;
 			SIVAL(pdata,0,len);
 			break;
+		}
 
 		case SMB_FILE_ALLOCATION_INFORMATION:
 		case SMB_QUERY_FILE_ALLOCATION_INFO:
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ALLOCATION_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ALLOCATION_INFORMATION\n"));
 			data_size = 8;
 			SOFF_T(pdata,0,allocation_size);
 			break;
 
 		case SMB_FILE_END_OF_FILE_INFORMATION:
 		case SMB_QUERY_FILE_END_OF_FILEINFO:
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_END_OF_FILE_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_END_OF_FILE_INFORMATION\n"));
 			data_size = 8;
 			SOFF_T(pdata,0,file_size);
 			break;
@@ -4496,8 +4189,9 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 		case SMB_QUERY_FILE_ALL_INFO:
 		case SMB_FILE_ALL_INFORMATION:
 		{
+			int len;
 			unsigned int ea_size = estimate_ea_size(conn, fsp, fname);
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ALL_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ALL_INFORMATION\n"));
 			put_long_date_timespec(pdata,create_time_ts);
 			put_long_date_timespec(pdata+8,atime_ts);
 			put_long_date_timespec(pdata+16,mtime_ts); /* write time */
@@ -4514,7 +4208,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 			pdata += 24;
 			SIVAL(pdata,0,ea_size);
 			pdata += 4; /* EA info */
-			len = srvstr_push(dstart, req->flags2,
+			len = srvstr_push(dstart, flags2,
 					  pdata+4, dos_fname,
 					  PTR_DIFF(dend, pdata+4),
 					  STR_UNICODE);
@@ -4530,14 +4224,14 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 			   I think this causes us to fail the IFSKIT
 			   BasicFileInformationTest. -tpot */
 
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_INTERNAL_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_INTERNAL_INFORMATION\n"));
 			SIVAL(pdata,0,sbuf.st_ex_ino); /* FileIndexLow */
 			SIVAL(pdata,4,sbuf.st_ex_dev); /* FileIndexHigh */
 			data_size = 8;
 			break;
 
 		case SMB_FILE_ACCESS_INFORMATION:
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ACCESS_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ACCESS_INFORMATION\n"));
 			if (fsp) {
 				SIVAL(pdata,0,fsp->access_mask);
 			} else {
@@ -4552,32 +4246,32 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 			{
 				size_t byte_len;
 				byte_len = dos_PutUniCode(pdata+4,dos_fname,(size_t)max_data_bytes,False);
-				DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_NAME_INFORMATION\n"));
+				DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_NAME_INFORMATION\n"));
 				SIVAL(pdata,0,byte_len);
 				data_size = 4 + byte_len;
 				break;
 			}
 
 		case SMB_FILE_DISPOSITION_INFORMATION:
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_DISPOSITION_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_DISPOSITION_INFORMATION\n"));
 			data_size = 1;
 			SCVAL(pdata,0,delete_pending);
 			break;
 
 		case SMB_FILE_POSITION_INFORMATION:
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_POSITION_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_POSITION_INFORMATION\n"));
 			data_size = 8;
 			SOFF_T(pdata,0,pos);
 			break;
 
 		case SMB_FILE_MODE_INFORMATION:
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_MODE_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_MODE_INFORMATION\n"));
 			SIVAL(pdata,0,mode);
 			data_size = 4;
 			break;
 
 		case SMB_FILE_ALIGNMENT_INFORMATION:
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ALIGNMENT_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ALIGNMENT_INFORMATION\n"));
 			SIVAL(pdata,0,0); /* No alignment needed. */
 			data_size = 4;
 			break;
@@ -4595,7 +4289,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 			unsigned int num_streams;
 			struct stream_struct *streams;
 
-			DEBUG(10,("call_trans2qfilepathinfo: "
+			DEBUG(10,("smbd_do_qfilepathinfo: "
 				  "SMB_FILE_STREAM_INFORMATION\n"));
 
 			status = SMB_VFS_STREAMINFO(
@@ -4605,8 +4299,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 			if (!NT_STATUS_IS_OK(status)) {
 				DEBUG(10, ("could not get stream info: %s\n",
 					   nt_errstr(status)));
-				reply_nterror(req, status);
-				return;
+				return status;
 			}
 
 			status = marshall_stream_info(num_streams, streams,
@@ -4616,8 +4309,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 			if (!NT_STATUS_IS_OK(status)) {
 				DEBUG(10, ("marshall_stream_info failed: %s\n",
 					   nt_errstr(status)));
-				reply_nterror(req, status);
-				return;
+				return status;
 			}
 
 			TALLOC_FREE(streams);
@@ -4626,7 +4318,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 		}
 		case SMB_QUERY_COMPRESSION_INFO:
 		case SMB_FILE_COMPRESSION_INFORMATION:
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_COMPRESSION_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_COMPRESSION_INFORMATION\n"));
 			SOFF_T(pdata,0,file_size);
 			SIVAL(pdata,8,0); /* ??? */
 			SIVAL(pdata,12,0); /* ??? */
@@ -4634,7 +4326,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 			break;
 
 		case SMB_FILE_NETWORK_OPEN_INFORMATION:
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_NETWORK_OPEN_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_NETWORK_OPEN_INFORMATION\n"));
 			put_long_date_timespec(pdata,create_time_ts);
 			put_long_date_timespec(pdata+8,atime_ts);
 			put_long_date_timespec(pdata+16,mtime_ts); /* write time */
@@ -4647,7 +4339,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 			break;
 
 		case SMB_FILE_ATTRIBUTE_TAG_INFORMATION:
-			DEBUG(10,("call_trans2qfilepathinfo: SMB_FILE_ATTRIBUTE_TAG_INFORMATION\n"));
+			DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ATTRIBUTE_TAG_INFORMATION\n"));
 			SIVAL(pdata,0,mode);
 			SIVAL(pdata,4,0);
 			data_size = 8;
@@ -4664,7 +4356,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
 			{
 				int i;
-				DEBUG(4,("call_trans2qfilepathinfo: SMB_QUERY_FILE_UNIX_BASIC "));
+				DEBUG(4,("smbd_do_qfilepathinfo: SMB_QUERY_FILE_UNIX_BASIC "));
 
 				for (i=0; i<100; i++)
 					DEBUG(4,("%d=%x, ",i, (*ppdata)[i]));
@@ -4680,7 +4372,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
 			{
 				int i;
-				DEBUG(4,("call_trans2qfilepathinfo: SMB_QUERY_FILE_UNIX_INFO2 "));
+				DEBUG(4,("smbd_do_qfilepathinfo: SMB_QUERY_FILE_UNIX_INFO2 "));
 
 				for (i=0; i<100; i++)
 					DEBUG(4,("%d=%x, ",i, (*ppdata)[i]));
@@ -4691,32 +4383,28 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
 		case SMB_QUERY_FILE_UNIX_LINK:
 			{
-				char *buffer = TALLOC_ARRAY(ctx, char, PATH_MAX+1);
+				int len;
+				char *buffer = TALLOC_ARRAY(mem_ctx, char, PATH_MAX+1);
 
 				if (!buffer) {
-					reply_nterror(req, NT_STATUS_NO_MEMORY);
-					return;
+					return NT_STATUS_NO_MEMORY;
 				}
 
-				DEBUG(10,("call_trans2qfilepathinfo: SMB_QUERY_FILE_UNIX_LINK\n"));
+				DEBUG(10,("smbd_do_qfilepathinfo: SMB_QUERY_FILE_UNIX_LINK\n"));
 #ifdef S_ISLNK
 				if(!S_ISLNK(sbuf.st_ex_mode)) {
-					reply_doserror(req, ERRSRV,
-							ERRbadlink);
-					return;
+					return NT_STATUS_DOS(ERRSRV, ERRbadlink);
 				}
 #else
-				reply_doserror(req, ERRDOS, ERRbadlink);
-				return;
+				return NT_STATUS_DOS(ERRDOS, ERRbadlink);
 #endif
-				len = SMB_VFS_READLINK(conn,fullpathname,
+				len = SMB_VFS_READLINK(conn,fname,
 						buffer, PATH_MAX);
 				if (len == -1) {
-					reply_nterror(req, map_nt_error_from_unix(errno));
-					return;
+					return map_nt_error_from_unix(errno);
 				}
 				buffer[len] = 0;
-				len = srvstr_push(dstart, req->flags2,
+				len = srvstr_push(dstart, flags2,
 						  pdata, buffer,
 						  PTR_DIFF(dend, pdata),
 						  STR_TERMINATE);
@@ -4741,12 +4429,9 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 				}
 
 				if (file_acl == NULL && no_acl_syscall_error(errno)) {
-					DEBUG(5,("call_trans2qfilepathinfo: ACLs not implemented on filesystem containing %s\n",
+					DEBUG(5,("smbd_do_qfilepathinfo: ACLs not implemented on filesystem containing %s\n",
 						fname ));
-					reply_nterror(
-						req,
-						NT_STATUS_NOT_IMPLEMENTED);
-					return;
+					return NT_STATUS_NOT_IMPLEMENTED;
 				}
 
 				if (S_ISDIR(sbuf.st_ex_mode)) {
@@ -4762,7 +4447,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 				num_def_acls = count_acl_entries(conn, def_acl);
 
 				if ( data_size < (num_file_acls + num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE + SMB_POSIX_ACL_HEADER_SIZE) {
-					DEBUG(5,("call_trans2qfilepathinfo: data_size too small (%u) need %u\n",
+					DEBUG(5,("smbd_do_qfilepathinfo: data_size too small (%u) need %u\n",
 						data_size,
 						(unsigned int)((num_file_acls + num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE +
 							SMB_POSIX_ACL_HEADER_SIZE) ));
@@ -4772,10 +4457,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 					if (def_acl) {
 						SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
 					}
-					reply_nterror(
-						req,
-						NT_STATUS_BUFFER_TOO_SMALL);
-					return;
+					return NT_STATUS_BUFFER_TOO_SMALL;
 				}
 
 				SSVAL(pdata,0,SMB_POSIX_ACL_VERSION);
@@ -4788,9 +4470,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 					if (def_acl) {
 						SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
 					}
-					reply_nterror(
-						req, NT_STATUS_INTERNAL_ERROR);
-					return;
+					return NT_STATUS_INTERNAL_ERROR;
 				}
 				if (!marshall_posix_acl(conn, pdata + SMB_POSIX_ACL_HEADER_SIZE + (num_file_acls*SMB_POSIX_ACL_ENTRY_SIZE), &sbuf, def_acl)) {
 					if (file_acl) {
@@ -4799,10 +4479,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 					if (def_acl) {
 						SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl);
 					}
-					reply_nterror(
-						req,
-						NT_STATUS_INTERNAL_ERROR);
-					return;
+					return NT_STATUS_INTERNAL_ERROR;
 				}
 
 				if (file_acl) {
@@ -4824,10 +4501,8 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 			uint32 lock_pid;
 			enum brl_type lock_type;
 
-			if (total_data != POSIX_LOCK_DATA_SIZE) {
-				reply_nterror(
-					req, NT_STATUS_INVALID_PARAMETER);
-				return;
+			if (lock_data_count != POSIX_LOCK_DATA_SIZE) {
+				return NT_STATUS_INVALID_PARAMETER;
 			}
 
 			switch (SVAL(pdata, POSIX_LOCK_TYPE_OFFSET)) {
@@ -4840,10 +4515,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 				case POSIX_LOCK_TYPE_UNLOCK:
 				default:
 					/* There's no point in asking for an unlock... */
-					reply_nterror(
-						req,
-						NT_STATUS_INVALID_PARAMETER);
-					return;
+					return NT_STATUS_INVALID_PARAMETER;
 			}
 
 			lock_pid = IVAL(pdata, POSIX_LOCK_PID_OFFSET);
@@ -4888,15 +4560,388 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 				memcpy(pdata, lock_data, POSIX_LOCK_DATA_SIZE);
 				SSVAL(pdata, POSIX_LOCK_TYPE_OFFSET, POSIX_LOCK_TYPE_UNLOCK);
 			} else {
-				reply_nterror(req, status);
-				return;
+				return status;
 			}
 			break;
 		}
 
 		default:
+			return NT_STATUS_INVALID_LEVEL;
+	}
+
+	*pdata_size = data_size;
+	return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Reply to a TRANS2_QFILEPATHINFO or TRANSACT2_QFILEINFO (query file info by
+ file name or file id).
+****************************************************************************/
+
+static void call_trans2qfilepathinfo(connection_struct *conn,
+				     struct smb_request *req,
+				     unsigned int tran_call,
+				     char **pparams, int total_params,
+				     char **ppdata, int total_data,
+				     unsigned int max_data_bytes)
+{
+	char *params = *pparams;
+	char *pdata = *ppdata;
+	uint16 info_level;
+	unsigned int data_size = 0;
+	unsigned int param_size = 2;
+	char *fname = NULL;
+	struct smb_filename *smb_fname = NULL;
+	bool delete_pending = False;
+	struct timespec write_time_ts;
+	files_struct *fsp = NULL;
+	struct file_id fileid;
+	struct ea_list *ea_list = NULL;
+	int lock_data_count = 0;
+	char *lock_data = NULL;
+	bool ms_dfs_link = false;
+	NTSTATUS status = NT_STATUS_OK;
+
+	if (!params) {
+		reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+		return;
+	}
+
+	ZERO_STRUCT(write_time_ts);
+
+	if (tran_call == TRANSACT2_QFILEINFO) {
+		if (total_params < 4) {
+			reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+			return;
+		}
+
+		if (IS_IPC(conn)) {
+			call_trans2qpipeinfo(conn, req,	tran_call,
+					     pparams, total_params,
+					     ppdata, total_data,
+					     max_data_bytes);
+			return;
+		}
+
+		fsp = file_fsp(req, SVAL(params,0));
+		info_level = SVAL(params,2);
+
+		DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QFILEINFO: level = %d\n", info_level));
+
+		if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
+			reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+			return;
+		}
+
+		/* Initial check for valid fsp ptr. */
+		if (!check_fsp_open(conn, req, fsp)) {
+			return;
+		}
+
+		fname = talloc_strdup(talloc_tos(),fsp->fsp_name);
+		if (!fname) {
+			reply_nterror(req, NT_STATUS_NO_MEMORY);
+			return;
+		}
+
+		status = create_synthetic_smb_fname_split(talloc_tos(), fname,
+							  NULL, &smb_fname);
+		if (!NT_STATUS_IS_OK(status)) {
+			reply_nterror(req, status);
+			return;
+		}
+
+		if(fsp->fake_file_handle) {
+			/*
+			 * This is actually for the QUOTA_FAKE_FILE --metze
+			 */
+
+			/* We know this name is ok, it's already passed the checks. */
+
+		} else if(fsp && (fsp->is_directory || fsp->fh->fd == -1)) {
+			/*
+			 * This is actually a QFILEINFO on a directory
+			 * handle (returned from an NT SMB). NT5.0 seems
+			 * to do this call. JRA.
+			 */
+
+			if (INFO_LEVEL_IS_UNIX(info_level)) {
+				/* Always do lstat for UNIX calls. */
+				if (SMB_VFS_LSTAT(conn, smb_fname)) {
+					DEBUG(3,("call_trans2qfilepathinfo: "
+						 "SMB_VFS_LSTAT of %s failed "
+						 "(%s)\n",
+						 smb_fname_str_dbg(smb_fname),
+						 strerror(errno)));
+					reply_nterror(req,
+						map_nt_error_from_unix(errno));
+					return;
+				}
+			} else if (SMB_VFS_STAT(conn, smb_fname)) {
+				DEBUG(3,("call_trans2qfilepathinfo: "
+					 "SMB_VFS_STAT of %s failed (%s)\n",
+					 smb_fname_str_dbg(smb_fname),
+					 strerror(errno)));
+				reply_nterror(req,
+					map_nt_error_from_unix(errno));
+				return;
+			}
+
+			fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
+			get_file_infos(fileid, &delete_pending, &write_time_ts);
+		} else {
+			/*
+			 * Original code - this is an open file.
+			 */
+			if (!check_fsp(conn, req, fsp)) {
+				return;
+			}
+
+			if (SMB_VFS_FSTAT(fsp, &smb_fname->st) != 0) {
+				DEBUG(3, ("fstat of fnum %d failed (%s)\n",
+					  fsp->fnum, strerror(errno)));
+				reply_nterror(req,
+					map_nt_error_from_unix(errno));
+				return;
+			}
+			fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
+			get_file_infos(fileid, &delete_pending, &write_time_ts);
+		}
+
+	} else {
+		/* qpathinfo */
+		if (total_params < 7) {
+			reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
+			return;
+		}
+
+		info_level = SVAL(params,0);
+
+		DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
+
+		if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
 			reply_nterror(req, NT_STATUS_INVALID_LEVEL);
 			return;
+		}
+
+		srvstr_get_path(req, params, req->flags2, &fname, &params[6],
+				total_params - 6,
+				STR_TERMINATE, &status);
+		if (!NT_STATUS_IS_OK(status)) {
+			reply_nterror(req, status);
+			return;
+		}
+
+		status = filename_convert(req,
+					conn,
+					req->flags2 & FLAGS2_DFS_PATHNAMES,
+					fname,
+					&smb_fname,
+					&fname);
+		if (!NT_STATUS_IS_OK(status)) {
+			if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+				reply_botherror(req,
+						NT_STATUS_PATH_NOT_COVERED,
+						ERRSRV, ERRbadpath);
+				return;
+			}
+			reply_nterror(req, status);
+			return;
+		}
+
+		/* If this is a stream, check if there is a delete_pending. */
+		if ((conn->fs_capabilities & FILE_NAMED_STREAMS)
+		    && is_ntfs_stream_smb_fname(smb_fname)) {
+			struct smb_filename *smb_fname_base = NULL;
+
+			/* Create an smb_filename with stream_name == NULL. */
+			status =
+			    create_synthetic_smb_fname(talloc_tos(),
+						       smb_fname->base_name,
+						       NULL, NULL,
+						       &smb_fname_base);
+			if (!NT_STATUS_IS_OK(status)) {
+				reply_nterror(req, status);
+				return;
+			}
+
+			if (INFO_LEVEL_IS_UNIX(info_level)) {
+				/* Always do lstat for UNIX calls. */
+				if (SMB_VFS_LSTAT(conn, smb_fname_base) != 0) {
+					DEBUG(3,("call_trans2qfilepathinfo: "
+						 "SMB_VFS_LSTAT of %s failed "
+						 "(%s)\n",
+						 smb_fname_str_dbg(smb_fname_base),
+						 strerror(errno)));
+					TALLOC_FREE(smb_fname_base);
+					reply_nterror(req,
+						map_nt_error_from_unix(errno));
+					return;
+				}
+			} else {
+				if (SMB_VFS_STAT(conn, smb_fname_base) != 0) {
+					DEBUG(3,("call_trans2qfilepathinfo: "
+						 "fileinfo of %s failed "
+						 "(%s)\n",
+						 smb_fname_str_dbg(smb_fname_base),
+						 strerror(errno)));
+					TALLOC_FREE(smb_fname_base);
+					reply_nterror(req,
+						map_nt_error_from_unix(errno));
+					return;
+				}
+			}
+
+			fileid = vfs_file_id_from_sbuf(conn,
+						       &smb_fname_base->st);
+			TALLOC_FREE(smb_fname_base);
+			get_file_infos(fileid, &delete_pending, NULL);
+			if (delete_pending) {
+				reply_nterror(req, NT_STATUS_DELETE_PENDING);
+				return;
+			}
+		}
+
+		if (INFO_LEVEL_IS_UNIX(info_level)) {
+			/* Always do lstat for UNIX calls. */
+			if (SMB_VFS_LSTAT(conn, smb_fname)) {
+				DEBUG(3,("call_trans2qfilepathinfo: "
+					 "SMB_VFS_LSTAT of %s failed (%s)\n",
+					 smb_fname_str_dbg(smb_fname),
+					 strerror(errno)));
+				reply_nterror(req,
+					map_nt_error_from_unix(errno));
+				return;
+			}
+
+		} else if (!VALID_STAT(smb_fname->st) &&
+			   SMB_VFS_STAT(conn, smb_fname) &&
+			   (info_level != SMB_INFO_IS_NAME_VALID)) {
+			ms_dfs_link = check_msdfs_link(conn, fname,
+						       &smb_fname->st);
+
+			if (!ms_dfs_link) {
+				DEBUG(3,("call_trans2qfilepathinfo: "
+					 "SMB_VFS_STAT of %s failed (%s)\n",
+					 smb_fname_str_dbg(smb_fname),
+					 strerror(errno)));
+				reply_nterror(req,
+					map_nt_error_from_unix(errno));
+				return;
+			}
+		}
+
+		fileid = vfs_file_id_from_sbuf(conn, &smb_fname->st);
+		get_file_infos(fileid, &delete_pending, &write_time_ts);
+		if (delete_pending) {
+			reply_nterror(req, NT_STATUS_DELETE_PENDING);
+			return;
+		}
+	}
+
+	DEBUG(3,("call_trans2qfilepathinfo %s (fnum = %d) level=%d call=%d total_data=%d\n",
+		fname,fsp ? fsp->fnum : -1, info_level,tran_call,total_data));
+
+	/* Pull out any data sent here before we realloc. */
+	switch (info_level) {
+		case SMB_INFO_QUERY_EAS_FROM_LIST:
+		{
+			/* Pull any EA list from the data portion. */
+			uint32 ea_size;
+
+			if (total_data < 4) {
+				reply_nterror(
+					req, NT_STATUS_INVALID_PARAMETER);
+				return;
+			}
+			ea_size = IVAL(pdata,0);
+
+			if (total_data > 0 && ea_size != total_data) {
+				DEBUG(4,("call_trans2qfilepathinfo: Rejecting EA request with incorrect \
+total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pdata,0) ));
+				reply_nterror(
+					req, NT_STATUS_INVALID_PARAMETER);
+				return;
+			}
+
+			if (!lp_ea_support(SNUM(conn))) {
+				reply_doserror(req, ERRDOS,
+					       ERReasnotsupported);
+				return;
+			}
+
+			/* Pull out the list of names. */
+			ea_list = read_ea_name_list(req, pdata + 4, ea_size - 4);
+			if (!ea_list) {
+				reply_nterror(
+					req, NT_STATUS_INVALID_PARAMETER);
+				return;
+			}
+			break;
+		}
+
+		case SMB_QUERY_POSIX_LOCK:
+		{
+			if (fsp == NULL || fsp->fh->fd == -1) {
+				reply_nterror(req, NT_STATUS_INVALID_HANDLE);
+				return;
+			}
+
+			if (total_data != POSIX_LOCK_DATA_SIZE) {
+				reply_nterror(
+					req, NT_STATUS_INVALID_PARAMETER);
+				return;
+			}
+
+			/* Copy the lock range data. */
+			lock_data = (char *)TALLOC_MEMDUP(
+				req, pdata, total_data);
+			if (!lock_data) {
+				reply_nterror(req, NT_STATUS_NO_MEMORY);
+				return;
+			}
+			lock_data_count = total_data;
+		}
+		default:
+			break;
+	}
+
+	*pparams = (char *)SMB_REALLOC(*pparams,2);
+	if (*pparams == NULL) {
+		reply_nterror(req, NT_STATUS_NO_MEMORY);
+		return;
+	}
+	params = *pparams;
+	SSVAL(params,0,0);
+
+	/*
+	 * draft-leach-cifs-v1-spec-02.txt
+	 * 4.2.14 TRANS2_QUERY_PATH_INFORMATION: Get File Attributes given Path
+	 * says:
+	 *
+	 *  The requested information is placed in the Data portion of the
+	 *  transaction response. For the information levels greater than 0x100,
+	 *  the transaction response has 1 parameter word which should be
+	 *  ignored by the client.
+	 *
+	 * However Windows only follows this rule for the IS_NAME_VALID call.
+	 */
+	switch (info_level) {
+	case SMB_INFO_IS_NAME_VALID:
+		param_size = 0;
+		break;
+	}
+
+	status = smbd_do_qfilepathinfo(conn, req, info_level,
+				       fsp, smb_fname,
+				       delete_pending, write_time_ts,
+				       ms_dfs_link, ea_list,
+				       lock_data_count, lock_data,
+				       req->flags2, max_data_bytes,
+				       ppdata, &data_size);
+	if (!NT_STATUS_IS_OK(status)) {
+		reply_nterror(req, status);
+		return;
 	}
 
 	send_trans2_replies(conn, req, params, param_size, *ppdata, data_size,