s3-lib Remove unused dos error codes from errmap_unix

[abartlet/samba.git/.git] / source3 / smbd / error.c

diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index de2de088ec222f30d0c7328bf628217173b49a77..5ba751647f15b9d1a69f62d2e5b9d1820b96c9c4 100644 (file)
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -18,11 +18,8 @@
 */
 
 #include "includes.h"
-
-/* From lib/error.c */
-extern struct unix_error_map unix_dos_nt_errmap[];
-
-extern uint32 global_client_caps;
+#include "smbd/smbd.h"
+#include "smbd/globals.h"
 
 bool use_nt_status(void)
 {
@@ -31,9 +28,29 @@ bool use_nt_status(void)
 
 /****************************************************************************
  Create an error packet. Normally called using the ERROR() macro.
- Setting eclass and ecode only and status to NT_STATUS_OK forces DOS errors.
- Setting status only and eclass and ecode to zero forces NT errors.
- If the override errors are set they take precedence over any passed in values.
+
+ Setting eclass and ecode to zero and status to a valid NT error will
+ reply with an NT error if the client supports CAP_STATUS32, otherwise
+ it maps to and returns a DOS error if the client doesn't support CAP_STATUS32.
+ This is the normal mode of calling this function via reply_nterror(req, status).
+
+ 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 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
+ other depending on the client supporting CAP_STATUS32 or not. This is the
+ path taken by calling reply_botherror(req, eclass, ecode, status);
+
+ 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_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
+ server.
 ****************************************************************************/
 
 void error_packet_set(char *outbuf, uint8 eclass, uint32 ecode, NTSTATUS ntstatus, int line, const char *file)
@@ -96,21 +113,20 @@ void reply_nt_error(struct smb_request *req, NTSTATUS ntstatus,
        error_packet_set((char *)req->outbuf, 0, 0, ntstatus, line, file);
 }
 
-void reply_force_nt_error(struct smb_request *req, NTSTATUS ntstatus,
-                         int line, const char *file)
-{
-       TALLOC_FREE(req->outbuf);
-       reply_outbuf(req, 0, 0);
-       error_packet_set((char *)req->outbuf, -1, -1, ntstatus, line, file);
-}
+/****************************************************************************
+ 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, line,
-                        file);
+       error_packet_set((char *)req->outbuf,
+                       eclass, ecode,
+                       NT_STATUS_DOS(eclass, ecode),
+                       line,
+                       file);
 }
 
 void reply_both_error(struct smb_request *req, uint8 eclass, uint32 ecode,
@@ -133,37 +149,12 @@ void reply_openerror(struct smb_request *req, NTSTATUS status)
                 */
                reply_botherror(req, NT_STATUS_OBJECT_NAME_COLLISION,
                        ERRDOS, ERRfilexists);
+       } else if (NT_STATUS_EQUAL(status, NT_STATUS_TOO_MANY_OPENED_FILES)) {
+               /* 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_force_doserror(req, ERRDOS, ERRnofids);
        } else {
                reply_nterror(req, status);
        }
 }
-
-void reply_unix_error(struct smb_request *req, uint8 defclass, uint32 defcode,
-                       NTSTATUS defstatus, int line, const char *file)
-{
-       int eclass=defclass;
-       int ecode=defcode;
-       NTSTATUS ntstatus = defstatus;
-       int i=0;
-
-       TALLOC_FREE(req->outbuf);
-       reply_outbuf(req, 0, 0);
-
-       if (errno != 0) {
-               DEBUG(3,("unix_error_packet: error string = %s\n",
-                       strerror(errno)));
-
-               while (unix_dos_nt_errmap[i].dos_class != 0) {
-                       if (unix_dos_nt_errmap[i].unix_error == errno) {
-                               eclass = unix_dos_nt_errmap[i].dos_class;
-                               ecode = unix_dos_nt_errmap[i].dos_code;
-                               ntstatus = unix_dos_nt_errmap[i].nt_error;
-                               break;
-                       }
-                       i++;
-               }
-       }
-
-       error_packet_set((char *)req->outbuf, eclass, ecode, ntstatus,
-               line, file);
-}