summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-12-21 11:16:38 -0800
committerJeremy Allison <jra@samba.org>2009-12-21 11:16:38 -0800
commit74deee3cc9bea2d1bd0c8a7374f8b1dbbbc4b499 (patch)
tree9834b37111948c6eddf8c7aebcffdd78f041bd42 /source3
parent642101ac237364fd9be209bf56d3224736626446 (diff)
downloadsamba-74deee3cc9bea2d1bd0c8a7374f8b1dbbbc4b499.tar.gz
samba-74deee3cc9bea2d1bd0c8a7374f8b1dbbbc4b499.tar.bz2
samba-74deee3cc9bea2d1bd0c8a7374f8b1dbbbc4b499.zip
Rename reply_doserror() -> reply_force_doserror().
Rewrite all calls to reply_nterror(NT_STATUS_DOS()) to reply_force_doserror() and update the comment in smbd/error.c Jeremy.
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/include/smb_macros.h2
-rw-r--r--source3/smbd/error.c20
-rw-r--r--source3/smbd/process.c4
-rw-r--r--source3/smbd/reply.c24
-rw-r--r--source3/smbd/trans2.c2
6 files changed, 23 insertions, 31 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index f138306f52..8bcde918fd 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6277,7 +6277,7 @@ void error_packet_set(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatu
int error_packet(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatus, int line, const char *file);
void reply_nt_error(struct smb_request *req, NTSTATUS ntstatus,
int line, const char *file);
-void reply_dos_error(struct smb_request *req, uint8 eclass, uint32 ecode,
+void reply_force_dos_error(struct smb_request *req, uint8 eclass, uint32 ecode,
int line, const char *file);
void reply_both_error(struct smb_request *req, uint8 eclass, uint32 ecode,
NTSTATUS status, int line, const char *file);
diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index a4a9ca088a..bc5d9a7fe1 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -112,7 +112,7 @@
#define ERROR_BOTH(status,class,code) error_packet(outbuf,class,code,status,__LINE__,__FILE__)
#define reply_nterror(req,status) reply_nt_error(req,status,__LINE__,__FILE__)
-#define reply_doserror(req,eclass,ecode) reply_dos_error(req,eclass,ecode,__LINE__,__FILE__)
+#define reply_force_doserror(req,eclass,ecode) reply_force_dos_error(req,eclass,ecode,__LINE__,__FILE__)
#define reply_botherror(req,status,eclass,ecode) reply_both_error(req,eclass,ecode,status,__LINE__,__FILE__)
#if 0
diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 85b4520a29..252eb77416 100644
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -39,7 +39,7 @@ bool use_nt_status(void)
Setting eclass and ecode to non-zero and status to NT_STATUS_OK (0) will map
from a DOS error to an NT error and reply with an NT error if the client
supports CAP_STATUS32, otherwise it replies with the given DOS error.
- This is the path taken by calling reply_doserror(req, eclass, ecode).
+ This mode is currently not used in the server.
Setting both eclass, ecode and status to non-zero values allows a non-default
mapping from NT error codes to DOS error codes, and will return one or the
@@ -48,13 +48,7 @@ bool use_nt_status(void)
Setting status to NT_STATUS_DOS(eclass, ecode) forces DOS errors even if the
client supports CAP_STATUS32. This is the path taken to force a DOS error
- reply by calling reply_nterror(req, NT_STATUS_DOS(eclass, ecode)).
- This is *very* unintuitive and the code should be changed so all
- current callers of reply_doserror() which don't care if they return NTSTATUS
- or DOS errors are changed to call reply_nterror() instead.
- reply_doserror() should then be changed to return DOS errors only and
- replace all current callers of reply_nterror(req, NT_STATUS_DOS(eclass, ecode)).
- I'll update this comment once the conversion is done. JRA.
+ reply by calling reply_force_doserror(req, eclass, ecode).
Setting status only and eclass to -1 forces NT errors even if the client
doesn't support CAP_STATUS32. This mode is currently never used in the
@@ -122,19 +116,17 @@ void reply_nt_error(struct smb_request *req, NTSTATUS ntstatus,
}
/****************************************************************************
- NB. This DOES NOT FORCE A DOS ERROR on the wire (although it
- probably should, I'm moving the rest of the Samba code towards that
- meaning. JRA.
+ Forces a DOS error on the wire.
****************************************************************************/
-void reply_dos_error(struct smb_request *req, uint8 eclass, uint32 ecode,
+void reply_force_dos_error(struct smb_request *req, uint8 eclass, uint32 ecode,
int line, const char *file)
{
TALLOC_FREE(req->outbuf);
reply_outbuf(req, 0, 0);
error_packet_set((char *)req->outbuf,
eclass, ecode,
- NT_STATUS_OK,
+ NT_STATUS_DOS(eclass, ecode),
line,
file);
}
@@ -163,7 +155,7 @@ void reply_openerror(struct smb_request *req, NTSTATUS status)
/* EMFILE always seems to be returned as a DOS error.
* See bug 6837. NOTE this forces a DOS error on the wire
* even though it's calling reply_nterror(). */
- reply_nterror(req, NT_STATUS_DOS(ERRDOS, ERRnofids));
+ reply_force_doserror(req, ERRDOS, ERRnofids);
} else {
reply_nterror(req, status);
}
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 18b2fd2d30..cc2e290227 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1343,7 +1343,7 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req, in
if (!change_to_user(conn,session_tag)) {
DEBUG(0, ("Error: Could not change to user. Removing "
"deferred open, mid=%d.\n", req->mid));
- reply_nterror(req, NT_STATUS_DOS(ERRSRV, ERRbaduid));
+ reply_force_doserror(req, ERRSRV, ERRbaduid);
return conn;
}
@@ -1809,7 +1809,7 @@ void chain_reply(struct smb_request *req)
* We end up here if there's any error in the chain syntax. Report a
* DOS error, just like Windows does.
*/
- reply_nterror(req, NT_STATUS_DOS(ERRSRV, ERRerror));
+ reply_force_doserror(req, ERRSRV, ERRerror);
fixup_chain_error_packet(req);
done:
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 64774ccf0d..b2d98bfbc0 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -704,7 +704,7 @@ void reply_tcon_and_X(struct smb_request *req)
}
if ((passlen > MAX_PASS_LEN) || (passlen >= req->buflen)) {
- reply_nterror(req, NT_STATUS_DOS(ERRDOS, ERRbuftoosmall));
+ reply_force_doserror(req, ERRDOS, ERRbuftoosmall);
END_PROFILE(SMBtconX);
return;
}
@@ -864,7 +864,7 @@ void reply_unknown_new(struct smb_request *req, uint8 type)
{
DEBUG(0, ("unknown command type (%s): type=%d (0x%X)\n",
smb_fn_name(type), type, type));
- reply_nterror(req, NT_STATUS_DOS(ERRSRV, ERRunknownsmb));
+ reply_force_doserror(req, ERRSRV, ERRunknownsmb);
return;
}
@@ -901,7 +901,7 @@ void reply_ioctl(struct smb_request *req)
replysize = 32;
break;
default:
- reply_nterror(req, NT_STATUS_DOS(ERRSRV, ERRnosupport));
+ reply_force_doserror(req, ERRSRV, ERRnosupport);
END_PROFILE(SMBioctl);
return;
}
@@ -1652,7 +1652,7 @@ void reply_fclose(struct smb_request *req)
p += 2;
if (status_len == 0) {
- reply_nterror(req, NT_STATUS_DOS(ERRSRV, ERRsrverror));
+ reply_force_doserror(req, ERRSRV, ERRsrverror);
END_PROFILE(SMBfclose);
return;
}
@@ -1738,7 +1738,7 @@ void reply_open(struct smb_request *req)
OPENX_FILE_EXISTS_OPEN, &access_mask,
&share_mode, &create_disposition,
&create_options)) {
- reply_nterror(req, NT_STATUS_DOS(ERRDOS, ERRbadaccess));
+ reply_force_doserror(req, ERRDOS, ERRbadaccess);
goto out;
}
@@ -1911,7 +1911,7 @@ void reply_open_and_X(struct smb_request *req)
&access_mask, &share_mode,
&create_disposition,
&create_options)) {
- reply_nterror(req, NT_STATUS_DOS(ERRDOS, ERRbadaccess));
+ reply_force_doserror(req, ERRDOS, ERRbadaccess);
goto out;
}
@@ -5041,7 +5041,7 @@ void reply_printclose(struct smb_request *req)
}
if (!CAN_PRINT(conn)) {
- reply_nterror(req, NT_STATUS_DOS(ERRSRV, ERRerror));
+ reply_force_doserror(req, ERRSRV, ERRerror);
END_PROFILE(SMBsplclose);
return;
}
@@ -7240,7 +7240,7 @@ void reply_lockingX(struct smb_request *req)
/* we don't support these - and CANCEL_LOCK makes w2k
and XP reboot so I don't really want to be
compatible! (tridge) */
- reply_nterror(req, NT_STATUS_DOS(ERRDOS, ERRnoatomiclocks));
+ reply_force_doserror(req, ERRDOS, ERRnoatomiclocks);
END_PROFILE(SMBlockingX);
return;
}
@@ -7428,7 +7428,7 @@ void reply_lockingX(struct smb_request *req)
void reply_readbmpx(struct smb_request *req)
{
START_PROFILE(SMBreadBmpx);
- reply_nterror(req, NT_STATUS_DOS(ERRSRV, ERRuseSTD));
+ reply_force_doserror(req, ERRSRV, ERRuseSTD);
END_PROFILE(SMBreadBmpx);
return;
}
@@ -7442,7 +7442,7 @@ void reply_readbmpx(struct smb_request *req)
void reply_readbs(struct smb_request *req)
{
START_PROFILE(SMBreadBs);
- reply_nterror(req, NT_STATUS_DOS(ERRSRV, ERRuseSTD));
+ reply_force_doserror(req, ERRSRV, ERRuseSTD);
END_PROFILE(SMBreadBs);
return;
}
@@ -7528,7 +7528,7 @@ void reply_setattrE(struct smb_request *req)
void reply_writebmpx(struct smb_request *req)
{
START_PROFILE(SMBwriteBmpx);
- reply_nterror(req, NT_STATUS_DOS(ERRSRV, ERRuseSTD));
+ reply_force_doserror(req, ERRSRV, ERRuseSTD);
END_PROFILE(SMBwriteBmpx);
return;
}
@@ -7542,7 +7542,7 @@ void reply_writebmpx(struct smb_request *req)
void reply_writebs(struct smb_request *req)
{
START_PROFILE(SMBwriteBs);
- reply_nterror(req, NT_STATUS_DOS(ERRSRV, ERRuseSTD));
+ reply_force_doserror(req, ERRSRV, ERRuseSTD);
END_PROFILE(SMBwriteBs);
return;
}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index ce001cb2fa..df61167354 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2462,7 +2462,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
if(numentries == 0) {
dptr_close(sconn, &dptr_num);
if (get_Protocol() < PROTOCOL_NT1) {
- reply_nterror(req, NT_STATUS_DOS(ERRDOS, ERRnofiles));
+ reply_force_doserror(req, ERRDOS, ERRnofiles);
goto out;
} else {
reply_botherror(req, NT_STATUS_NO_SUCH_FILE,