svn commit: samba r20841 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_24/source/smbd

[jra at samba.org]

Author: jra
Date: 2007-01-16 20:49:51 +0000 (Tue, 16 Jan 2007)
New Revision: 20841

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

Log:
Remove more BOOL ok.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/reply.c
   branches/SAMBA_3_0_24/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2007-01-16 20:32:39 UTC (rev 20840)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2007-01-16 20:49:51 UTC (rev 20841)
@@ -3770,7 +3770,6 @@
 {
 	pstring directory;
 	int outsize = 0;
-	BOOL ok = False;
 	SMB_STRUCT_STAT sbuf;
 	NTSTATUS status;
 	START_PROFILE(SMBrmdir);
@@ -3789,12 +3788,13 @@
 		return ERROR_NT(status);
 	}
   
-	if (check_name(directory,conn)) {
-		dptr_closepath(directory,SVAL(inbuf,smb_pid));
-		ok = rmdir_internals(conn, directory);
+	if (!check_name(directory,conn)) {
+		END_PROFILE(SMBrmdir);
+		return UNIXERROR(ERRDOS, ERRbadpath);
 	}
-  
-	if (!ok) {
+
+	dptr_closepath(directory,SVAL(inbuf,smb_pid));
+	if (!rmdir_internals(conn, directory)) {
 		END_PROFILE(SMBrmdir);
 		return UNIXERROR(ERRDOS, ERRbadpath);
 	}

Modified: branches/SAMBA_3_0_24/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0_24/source/smbd/reply.c	2007-01-16 20:32:39 UTC (rev 20840)
+++ branches/SAMBA_3_0_24/source/smbd/reply.c	2007-01-16 20:49:51 UTC (rev 20841)
@@ -3769,7 +3769,6 @@
 {
 	pstring directory;
 	int outsize = 0;
-	BOOL ok = False;
 	SMB_STRUCT_STAT sbuf;
 	NTSTATUS status;
 	START_PROFILE(SMBrmdir);
@@ -3788,12 +3787,13 @@
 		return ERROR_NT(status);
 	}
   
-	if (check_name(directory,conn)) {
-		dptr_closepath(directory,SVAL(inbuf,smb_pid));
-		ok = rmdir_internals(conn, directory);
+	if (!check_name(directory,conn)) {
+		END_PROFILE(SMBrmdir);
+		return UNIXERROR(ERRDOS, ERRbadpath);
 	}
-  
-	if (!ok) {
+
+	dptr_closepath(directory,SVAL(inbuf,smb_pid));
+	if (!rmdir_internals(conn, directory)) {
 		END_PROFILE(SMBrmdir);
 		return UNIXERROR(ERRDOS, ERRbadpath);
 	}