summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-10-02 00:55:22 +0000
committerJeremy Allison <jra@samba.org>2003-10-02 00:55:22 +0000
commitc5b34aa7e6fb81068a303fb1b1d2d2b789eeda06 (patch)
tree49d206e782b7872f8edd7ecd07e80d74a1798631 /source3/smbd
parentad12b87aeb3b838a330633f151bacdd30fec0a1c (diff)
downloadsamba-c5b34aa7e6fb81068a303fb1b1d2d2b789eeda06.tar.gz
samba-c5b34aa7e6fb81068a303fb1b1d2d2b789eeda06.tar.bz2
samba-c5b34aa7e6fb81068a303fb1b1d2d2b789eeda06.zip
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)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/error.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index 9d0e34bf52..7eec5e25df 100644
--- 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