Implemented the level 1010 NT rename level. Many fixes for Samba4 test

correctness.
Jeremy.
(This used to be commit f57429befa43d63ed9a6e19b854e22fd4151db40)

1 files changed, 86 insertions, 41 deletions

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 3716378b37..f56d2dff22 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1,7 +1,7 @@
 /* 
    Unix SMB/CIFS implementation.
    SMB transaction2 handling
-   Copyright (C) Jeremy Allison			1994-2001
+   Copyright (C) Jeremy Allison			1994-2003
    Copyright (C) Stefan (metze) Metzmacher	2003
 
    Extensively modified by Andrew Tridgell, 1995
@@ -261,8 +261,7 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
 	unix_convert(fname,conn,0,&bad_path,&sbuf);
     
 	if (!check_name(fname,conn)) {
-		set_bad_path_error(errno, bad_path);
-		return(UNIXERROR(ERRDOS,ERRnoaccess));
+		return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess);
 	}
 
 	unixmode = unix_mode(conn,open_attr | aARCH, fname);
@@ -271,8 +270,7 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, i
 		oplock_request, &rmode,&smb_action);
       
 	if (!fsp) {
-		set_bad_path_error(errno, bad_path);
-		return(UNIXERROR(ERRDOS,ERRnoaccess));
+		return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess);
 	}
 
 	size = get_file_size(sbuf);
@@ -441,9 +439,9 @@ static mode_t unix_perms_from_wire( connection_struct *conn, SMB_STRUCT_STAT *ps
 }
 
 /****************************************************************************
-checks for SMB_TIME_NO_CHANGE and if not found
-calls interpret_long_date
+ Checks for SMB_TIME_NO_CHANGE and if not found calls interpret_long_date.
 ****************************************************************************/
+
 time_t interpret_long_unix_date(char *p)
 {
 	DEBUG(1,("interpret_long_unix_date\n"));
@@ -910,8 +908,7 @@ close_if_end = %d requires_resume_key = %d level = %d, max_data_bytes = %d\n",
 
 	unix_convert(directory,conn,0,&bad_path,&sbuf);
 	if(!check_name(directory,conn)) {
-		set_bad_path_error(errno, bad_path);
-		return(UNIXERROR(ERRDOS,ERRbadpath));
+		return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
 	}
 
 	p = strrchr_m(directory,'/');
@@ -1716,14 +1713,22 @@ static int call_trans2setfsinfo(connection_struct *conn,
  *  Utility function to set bad path error.
  ****************************************************************************/
 
-NTSTATUS set_bad_path_error(int err, BOOL bad_path)
+int set_bad_path_error(int err, BOOL bad_path, char *outbuf, int def_class, uint32 def_code)
 {
-	if((err == ENOENT) && bad_path) {
+	DEBUG(10,("set_bad_path_error: err = %dm bad_path = %d\n",
+			err, (int)bad_path ));
+
+	if(err == ENOENT) {
 		unix_ERR_class = ERRDOS;
-		unix_ERR_code = ERRbadpath;
-		return NT_STATUS_OBJECT_PATH_NOT_FOUND;
+		if (bad_path) {
+			unix_ERR_code = ERRbadpath;
+			return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
+		} else {
+			unix_ERR_code = ERRbadfile;
+			return ERROR_NT(NT_STATUS_OBJECT_NAME_NOT_FOUND);
+		}
 	}
-	return NT_STATUS_OK;
+	return UNIXERROR(def_class,def_code);
 }
 
 /****************************************************************************
@@ -1778,8 +1783,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn,
 			unix_convert(fname,conn,0,&bad_path,&sbuf);
 			if (!check_name(fname,conn)) {
 				DEBUG(3,("call_trans2qfilepathinfo: fileinfo of %s failed for fake_file(%s)\n",fname,strerror(errno)));
-				set_bad_path_error(errno, bad_path);
-				return(UNIXERROR(ERRDOS,ERRbadpath));
+				return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
 			}
 			
 		} else if(fsp && (fsp->is_directory || fsp->fd == -1)) {
@@ -1792,21 +1796,18 @@ static int call_trans2qfilepathinfo(connection_struct *conn,
 			unix_convert(fname,conn,0,&bad_path,&sbuf);
 			if (!check_name(fname,conn)) {
 				DEBUG(3,("call_trans2qfilepathinfo: fileinfo of %s failed (%s)\n",fname,strerror(errno)));
-				set_bad_path_error(errno, bad_path);
-				return(UNIXERROR(ERRDOS,ERRbadpath));
+				return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
 			}
 		  
 			if (INFO_LEVEL_IS_UNIX(info_level)) {
 				/* Always do lstat for UNIX calls. */
 				if (SMB_VFS_LSTAT(conn,fname,&sbuf)) {
 					DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_LSTAT of %s failed (%s)\n",fname,strerror(errno)));
-					set_bad_path_error(errno, bad_path);
-					return(UNIXERROR(ERRDOS,ERRbadpath));
+					return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
 				}
 			} else if (!VALID_STAT(sbuf) && SMB_VFS_STAT(conn,fname,&sbuf)) {
 				DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno)));
-				set_bad_path_error(errno, bad_path);
-				return(UNIXERROR(ERRDOS,ERRbadpath));
+				return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
 			}
 
 			delete_pending = fsp->directory_delete_on_close;
@@ -1840,29 +1841,26 @@ static int call_trans2qfilepathinfo(connection_struct *conn,
 		unix_convert(fname,conn,0,&bad_path,&sbuf);
 		if (!check_name(fname,conn)) {
 			DEBUG(3,("call_trans2qfilepathinfo: fileinfo of %s failed (%s)\n",fname,strerror(errno)));
-			set_bad_path_error(errno, bad_path);
-			return(UNIXERROR(ERRDOS,ERRbadpath));
+			return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
 		}
 
 		if (INFO_LEVEL_IS_UNIX(info_level)) {
 			/* Always do lstat for UNIX calls. */
 			if (SMB_VFS_LSTAT(conn,fname,&sbuf)) {
 				DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_LSTAT of %s failed (%s)\n",fname,strerror(errno)));
-				set_bad_path_error(errno, bad_path);
-				return(UNIXERROR(ERRDOS,ERRbadpath));
+				return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
 			}
 		} else if (!VALID_STAT(sbuf) && SMB_VFS_STAT(conn,fname,&sbuf)) {
 			DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno)));
-			set_bad_path_error(errno, bad_path);
-			return(UNIXERROR(ERRDOS,ERRbadpath));
+			return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
 		}
 	}
 
 	if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions())
 		return ERROR_DOS(ERRDOS,ERRunknownlevel);
 
-	DEBUG(3,("call_trans2qfilepathinfo %s level=%d call=%d total_data=%d\n",
-		fname,info_level,tran_call,total_data));
+	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));
 
 	p = strrchr_m(fname,'/'); 
 	if (!p)
@@ -2422,8 +2420,7 @@ static int call_trans2setfilepathinfo(connection_struct *conn,
 			unix_convert(fname,conn,0,&bad_path,&sbuf);
 			if (!check_name(fname,conn) || (!VALID_STAT(sbuf))) {
 				DEBUG(3,("call_trans2setfilepathinfo: fileinfo of %s failed (%s)\n",fname,strerror(errno)));
-				set_bad_path_error(errno, bad_path);
-				return(UNIXERROR(ERRDOS,ERRbadpath));
+				return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
 			}
 		} else if (fsp && fsp->print_file) {
 			/*
@@ -2462,8 +2459,7 @@ static int call_trans2setfilepathinfo(connection_struct *conn,
 		srvstr_pull(inbuf, fname, &params[6], sizeof(fname), -1, STR_TERMINATE);
 		unix_convert(fname,conn,0,&bad_path,&sbuf);
 		if(!check_name(fname, conn)) {
-			set_bad_path_error(errno, bad_path);
-			return(UNIXERROR(ERRDOS,ERRbadpath));
+			return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
 		}
 
 		/*
@@ -2472,8 +2468,7 @@ static int call_trans2setfilepathinfo(connection_struct *conn,
 
 		if(!VALID_STAT(sbuf) && !INFO_LEVEL_IS_UNIX(info_level)) {
 			DEBUG(3,("call_trans2setfilepathinfo: stat of %s failed (%s)\n", fname, strerror(errno)));
-			set_bad_path_error(errno, bad_path);
-			return(UNIXERROR(ERRDOS,ERRbadpath));
+			return ERROR_NT(NT_STATUS_OBJECT_NAME_NOT_FOUND);
 		}    
 	}
 
@@ -2486,8 +2481,8 @@ static int call_trans2setfilepathinfo(connection_struct *conn,
 	if (VALID_STAT(sbuf))
 		unixmode = sbuf.st_mode;
 
-	DEBUG(3,("call_trans2setfilepathinfo(%d) %s info_level=%d totdata=%d\n",
-		tran_call,fname,info_level,total_data));
+	DEBUG(3,("call_trans2setfilepathinfo(%d) %s (fnum %d) info_level=%d totdata=%d\n",
+		tran_call,fname, fsp ? fsp->fnum : -1, info_level,total_data));
 
 	/* Realloc the parameter and data sizes */
 	params = Realloc(*pparams,2);
@@ -2679,12 +2674,14 @@ static int call_trans2setfilepathinfo(connection_struct *conn,
 		case SMB_FILE_DISPOSITION_INFORMATION:
 		case SMB_SET_FILE_DISPOSITION_INFO: /* Set delete on close for open file. */
 		{
-			BOOL delete_on_close = (CVAL(pdata,0) ? True : False);
+			BOOL delete_on_close;
 			NTSTATUS status;
 
 			if (total_data < 1)
 				return(ERROR_DOS(ERRDOS,ERRinvalidparam));
 
+			delete_on_close = (CVAL(pdata,0) ? True : False);
+
 			/* Just ignore this set on a path. */
 			if (tran_call != TRANSACT2_SETFILEINFO)
 				break;
@@ -2905,6 +2902,55 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
 			return(-1);
 		}
 
+		case SMB_FILE_RENAME_INFORMATION:
+		{
+			BOOL overwrite;
+			uint32 root_fid;
+			uint32 len;
+			pstring newname;
+			pstring base_name;
+			char *p;
+			NTSTATUS status;
+
+			if (total_data < 12)
+				return(ERROR_DOS(ERRDOS,ERRinvalidparam));
+
+			overwrite = (CVAL(pdata,0) ? True : False);
+			root_fid = IVAL(pdata,4);
+			len = IVAL(pdata,8);
+			srvstr_pull(inbuf, newname, &pdata[12], sizeof(newname), len, 0);
+
+			/* Check the new name has no '\' characters. */
+			if (strchr_m(newname, '\\') || strchr_m(newname, '/'))
+				return ERROR_NT(NT_STATUS_NOT_SUPPORTED);
+
+			RESOLVE_DFSPATH(newname, conn, inbuf, outbuf);
+
+			/* Create the base directory. */
+			pstrcpy(base_name, fname);
+			p = strrchr_m(base_name, '/');
+			if (p)
+				*p = '\0';
+			/* Append the new name. */
+			pstrcat(base_name, "/");
+			pstrcat(base_name, newname);
+
+			if (fsp) {
+				DEBUG(10,("call_trans2setfilepathinfo: SMB_FILE_RENAME_INFORMATION (fnum %d) %s -> %s\n",
+					fsp->fnum, fsp->fsp_name, base_name ));
+				status = rename_internals_fsp(conn, fsp, base_name, overwrite);
+			} else {
+				DEBUG(10,("call_trans2setfilepathinfo: SMB_FILE_RENAME_INFORMATION %s -> %s\n",
+					fname, newname ));
+				status = rename_internals(conn, fname, base_name, overwrite);
+			}
+			if (!NT_STATUS_IS_OK(status))
+				return ERROR_NT(status);
+			process_pending_change_notify_queue((time_t)0);
+			SSVAL(params,0,0);
+			send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
+			return(-1);
+		}
 		default:
 			return ERROR_DOS(ERRDOS,ERRunknownlevel);
 	}
@@ -3056,8 +3102,7 @@ static int call_trans2mkdir(connection_struct *conn,
   
 	if(ret < 0) {
 		DEBUG(5,("call_trans2mkdir error (%s)\n", strerror(errno)));
-		set_bad_path_error(errno, bad_path);
-		return(UNIXERROR(ERRDOS,ERRnoaccess));
+		return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess);
 	}
 
 	/* Realloc the parameter and data sizes */