summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/smbd/process.c2
-rw-r--r--source3/smbd/reply.c39
2 files changed, 25 insertions, 16 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 4b0f2902ef..dafea5ed2f 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -635,7 +635,7 @@ static const struct smb_message_struct {
} smb_messages[256] = {
/* 0x00 */ { "SMBmkdir",NULL,reply_mkdir,AS_USER | NEED_WRITE},
-/* 0x01 */ { "SMBrmdir",reply_rmdir,NULL,AS_USER | NEED_WRITE},
+/* 0x01 */ { "SMBrmdir",NULL,reply_rmdir,AS_USER | NEED_WRITE},
/* 0x02 */ { "SMBopen",reply_open,NULL,AS_USER },
/* 0x03 */ { "SMBcreate",reply_mknew,NULL,AS_USER},
/* 0x04 */ { "SMBclose",NULL,reply_close,AS_USER | CAN_IPC },
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index b1e2f00067..64e63abdf1 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4205,56 +4205,65 @@ NTSTATUS rmdir_internals(connection_struct *conn, const char *directory)
Reply to a rmdir.
****************************************************************************/
-int reply_rmdir(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize)
+void reply_rmdir(connection_struct *conn, struct smb_request *req)
{
pstring directory;
- int outsize = 0;
SMB_STRUCT_STAT sbuf;
NTSTATUS status;
START_PROFILE(SMBrmdir);
- srvstr_get_path(inbuf, SVAL(inbuf,smb_flg2), directory,
- smb_buf(inbuf) + 1, sizeof(directory), 0,
+ srvstr_get_path((char *)req->inbuf, req->flags2, directory,
+ smb_buf(req->inbuf) + 1, sizeof(directory), 0,
STR_TERMINATE, &status);
if (!NT_STATUS_IS_OK(status)) {
+ reply_nterror(req, status);
END_PROFILE(SMBrmdir);
- return ERROR_NT(status);
+ return;
}
- status = resolve_dfspath(conn, SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES, directory);
+ status = resolve_dfspath(conn,
+ req->flags2 & FLAGS2_DFS_PATHNAMES,
+ directory);
if (!NT_STATUS_IS_OK(status)) {
- END_PROFILE(SMBrmdir);
if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
- return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, ERRSRV, ERRbadpath);
+ reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
+ ERRSRV, ERRbadpath);
+ END_PROFILE(SMBrmdir);
+ return;
}
- return ERROR_NT(status);
+ reply_nterror(req, status);
+ END_PROFILE(SMBrmdir);
+ return;
}
status = unix_convert(conn, directory, False, NULL, &sbuf);
if (!NT_STATUS_IS_OK(status)) {
+ reply_nterror(req, status);
END_PROFILE(SMBrmdir);
- return ERROR_NT(status);
+ return;
}
status = check_name(conn, directory);
if (!NT_STATUS_IS_OK(status)) {
+ reply_nterror(req, status);
END_PROFILE(SMBrmdir);
- return ERROR_NT(status);
+ return;
}
- dptr_closepath(directory,SVAL(inbuf,smb_pid));
+ dptr_closepath(directory, req->smbpid);
status = rmdir_internals(conn, directory);
if (!NT_STATUS_IS_OK(status)) {
+ reply_nterror(req, status);
END_PROFILE(SMBrmdir);
- return ERROR_NT(status);
+ return;
}
- outsize = set_message(inbuf,outbuf,0,0,False);
+ reply_outbuf(req, 0, 0);
DEBUG( 3, ( "rmdir %s\n", directory ) );
END_PROFILE(SMBrmdir);
- return(outsize);
+ return;
}
/*******************************************************************