svn commit: samba r20611 - in branches/SAMBA_3_0/source/smbd: .

[vlendec at samba.org]

Author: vlendec
Date: 2007-01-08 15:26:17 +0000 (Mon, 08 Jan 2007)
New Revision: 20611

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20611

Log:
All but one callers to set_bad_path_error have had the bad_path==True argument
being handled further up.

Volker

Modified:
   branches/SAMBA_3_0/source/smbd/nttrans.c
   branches/SAMBA_3_0/source/smbd/reply.c
   branches/SAMBA_3_0/source/smbd/trans2.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/nttrans.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/nttrans.c	2007-01-08 14:16:42 UTC (rev 20610)
+++ branches/SAMBA_3_0/source/smbd/nttrans.c	2007-01-08 15:26:17 UTC (rev 20611)
@@ -639,7 +639,8 @@
 	if (!check_name(fname,conn)) {
 		restore_case_semantics(conn, file_attributes);
 		END_PROFILE(SMBntcreateX);
-		return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+		return set_bad_path_error(errno, False, outbuf,
+					  ERRDOS,ERRbadpath);
 	}
 
 #if 0
@@ -1265,7 +1266,7 @@
 	/* All file access must go through check_name() */
 	if (!check_name(fname,conn)) {
 		restore_case_semantics(conn, file_attributes);
-		return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+		return set_bad_path_error(errno, False, outbuf, ERRDOS,ERRbadpath);
 	}
     
 #if 0

Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2007-01-08 14:16:42 UTC (rev 20610)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2007-01-08 15:26:17 UTC (rev 20611)
@@ -948,7 +948,8 @@
   
 	if (!ok) {
 		END_PROFILE(SMBgetatr);
-		return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadfile);
+		return set_bad_path_error(errno, False, outbuf,
+					  ERRDOS,ERRbadfile);
 	}
  
 	outsize = set_message(outbuf,10,0,True);
@@ -4006,7 +4007,8 @@
   
 	if (!ok) {
 		END_PROFILE(SMBrmdir);
-		return set_bad_path_error(errno, bad_path, outbuf, ERRDOS, ERRbadpath);
+		return set_bad_path_error(errno, False, outbuf,
+					  ERRDOS, ERRbadpath);
 	}
  
 	outsize = set_message(outbuf,0,0,False);

Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/trans2.c	2007-01-08 14:16:42 UTC (rev 20610)
+++ branches/SAMBA_3_0/source/smbd/trans2.c	2007-01-08 15:26:17 UTC (rev 20611)
@@ -807,7 +807,8 @@
 	}
     
 	if (!check_name(fname,conn)) {
-		return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRnoaccess);
+		return set_bad_path_error(errno, False, outbuf,
+					  ERRDOS, ERRnoaccess);
 	}
 
 	if (open_ofun == 0) {
@@ -1725,7 +1726,8 @@
 		return ERROR_NT(NT_STATUS_OBJECT_PATH_NOT_FOUND);
 	}
 	if(!check_name(directory,conn)) {
-		return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+		return set_bad_path_error(errno, False, outbuf,
+					  ERRDOS,ERRbadpath);
 	}
 
 	p = strrchr_m(directory,'/');
@@ -2906,11 +2908,14 @@
 				/* 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)));
-					return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+					return set_bad_path_error(
+						errno, False, outbuf,
+						ERRDOS,ERRbadpath);
 				}
 			} else if (SMB_VFS_STAT(conn,fname,&sbuf)) {
 				DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno)));
-				return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+				return set_bad_path_error(errno, False, outbuf,
+							  ERRDOS,ERRbadpath);
 			}
 
 			delete_pending = get_delete_on_close_flag(sbuf.st_dev, sbuf.st_ino);
@@ -2954,18 +2959,21 @@
 		}
 		if (!check_name(fname,conn)) {
 			DEBUG(3,("call_trans2qfilepathinfo: fileinfo of %s failed (%s)\n",fname,strerror(errno)));
-			return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+			return set_bad_path_error(errno, False, 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)));
-				return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+				return set_bad_path_error(errno, False, outbuf,
+							  ERRDOS,ERRbadpath);
 			}
 		} else if (!VALID_STAT(sbuf) && SMB_VFS_STAT(conn,fname,&sbuf) && (info_level != SMB_INFO_IS_NAME_VALID)) {
 			DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno)));
-			return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+			return set_bad_path_error(errno, False, outbuf,
+						  ERRDOS,ERRbadpath);
 		}
 
 		delete_pending = get_delete_on_close_flag(sbuf.st_dev, sbuf.st_ino);
@@ -3811,7 +3819,8 @@
 			pstrcpy(fname, fsp->fsp_name);
 			if (SMB_VFS_STAT(conn,fname,&sbuf) != 0) {
 				DEBUG(3,("call_trans2setfilepathinfo: fileinfo of %s failed (%s)\n",fname,strerror(errno)));
-				return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+				return set_bad_path_error(errno, False, outbuf,
+							  ERRDOS,ERRbadpath);
 			}
 		} else if (fsp && fsp->print_file) {
 			/*
@@ -3863,11 +3872,13 @@
 
 		if(!VALID_STAT(sbuf) && !INFO_LEVEL_IS_UNIX(info_level)) {
 			DEBUG(3,("call_trans2setfilepathinfo: stat of %s failed (%s)\n", fname, strerror(errno)));
-			return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+			return set_bad_path_error(errno, False, outbuf,
+						  ERRDOS,ERRbadpath);
 		}    
 
 		if(!check_name(fname, conn)) {
-			return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath);
+			return set_bad_path_error(errno, False, outbuf,
+						  ERRDOS,ERRbadpath);
 		}
 
 	}
@@ -4860,7 +4871,7 @@
 
 	if (!check_name(directory,conn)) {
 		DEBUG(5,("call_trans2mkdir error (%s)\n", strerror(errno)));
-		return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,
+		return set_bad_path_error(errno, False, outbuf, ERRDOS,
 					  ERRnoaccess);
 	}