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

[vlendec at samba.org]

Author: vlendec
Date: 2007-01-08 21:13:27 +0000 (Mon, 08 Jan 2007)
New Revision: 20619

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

Log:
bad_path is handled somewhere else, so can_delete does not need it anymore
Modified:
   branches/SAMBA_3_0/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2007-01-08 21:08:31 UTC (rev 20618)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2007-01-08 21:13:27 UTC (rev 20619)
@@ -1899,7 +1899,7 @@
 ********************************************************************/
 
 static NTSTATUS can_delete(connection_struct *conn, char *fname,
-			   uint32 dirtype, BOOL bad_path)
+			   uint32 dirtype)
 {
 	SMB_STRUCT_STAT sbuf;
 	uint32 fattr;
@@ -1913,13 +1913,6 @@
 	}
 
 	if (SMB_VFS_LSTAT(conn,fname,&sbuf) != 0) {
-	        if(errno == ENOENT) {
-			if (bad_path) {
-				return NT_STATUS_OBJECT_PATH_NOT_FOUND;
-			} else {
-				return NT_STATUS_OBJECT_NAME_NOT_FOUND;
-			}
-		}
 		return map_nt_error_from_unix(errno);
 	}
 
@@ -2031,7 +2024,7 @@
 	if (!has_wild) {
 		pstrcat(directory,"/");
 		pstrcat(directory,mask);
-		error = can_delete(conn,directory,dirtype,bad_path);
+		error = can_delete(conn,directory,dirtype);
 		if (!NT_STATUS_IS_OK(error))
 			return error;
 
@@ -2092,8 +2085,7 @@
 				}
 
 				slprintf(fname,sizeof(fname)-1, "%s/%s",directory,dname);
-				error = can_delete(conn, fname, dirtype,
-						   bad_path);
+				error = can_delete(conn, fname, dirtype);
 				if (!NT_STATUS_IS_OK(error)) {
 					continue;
 				}