summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-01-16 20:49:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:12 -0500
commit16f96517f1f51fb9a8fd75e513bb985bf152adae (patch)
tree8290d26a3aa449a82b2bc3b6cdacab59fb8357b6
parent6d16226a2d449ab7731bc686a742a2b31ccf41ae (diff)
downloadsamba-16f96517f1f51fb9a8fd75e513bb985bf152adae.tar.gz
samba-16f96517f1f51fb9a8fd75e513bb985bf152adae.tar.bz2
samba-16f96517f1f51fb9a8fd75e513bb985bf152adae.zip
r20841: Remove more BOOL ok.
Jeremy. (This used to be commit c6b651966039b1c21facd4c4789bf873b5b49426)
-rw-r--r--source3/smbd/reply.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index d48c081e21..f633be3740 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3770,7 +3770,6 @@ int reply_rmdir(connection_struct *conn, char *inbuf,char *outbuf, int dum_size,
{
pstring directory;
int outsize = 0;
- BOOL ok = False;
SMB_STRUCT_STAT sbuf;
NTSTATUS status;
START_PROFILE(SMBrmdir);
@@ -3789,12 +3788,13 @@ int reply_rmdir(connection_struct *conn, char *inbuf,char *outbuf, int dum_size,
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);
}