Fix for not opening Excel 2000 files that are read-only. Needs tidying

up but works for now.
Jeremy.
(This used to be commit 9ad9e0dfafed4558e5ab215991d9912cd44f1127)

diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 9d0e34bf52714f2a36c67fc7b01ce9f6ccc03486..7eec5e25dfbf4f62f93dce88831f5f4f6021bc3c 100644 (file)
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -61,9 +61,6 @@ int unix_error_packet(char *outbuf,int def_class,uint32 def_code,
                eclass = unix_ERR_class;
                ecode = unix_ERR_code;
                ntstatus = unix_ERR_ntstatus;
-               unix_ERR_class = SMB_SUCCESS;
-               unix_ERR_code = 0;
-               unix_ERR_ntstatus = NT_STATUS_OK;
        } else {
                while (unix_dos_nt_errmap[i].dos_class != 0) {
                        if (unix_dos_nt_errmap[i].unix_error == errno) {
@@ -93,6 +90,10 @@ int error_packet(char *outbuf,NTSTATUS ntstatus,
        if (errno != 0)
                DEBUG(3,("error string = %s\n",strerror(errno)));
   
+       unix_ERR_class = SMB_SUCCESS;
+       unix_ERR_code = 0;
+       unix_ERR_ntstatus = NT_STATUS_OK;
+
        /*
         * We can explicitly force 32 bit error codes even when the
         * parameter "nt status" is set to no by pre-setting the