summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-04-16 19:23:10 +0000
committerJeremy Allison <jra@samba.org>1998-04-16 19:23:10 +0000
commit7b9a53b68079231fc0c65ee4a265de297031a161 (patch)
tree3c9cf8c5f7cef9c0d027bfb1a8efbd955d36479b /source3/smbd
parente459b7d4d9b249270cebc3d68a0b436e59522248 (diff)
downloadsamba-7b9a53b68079231fc0c65ee4a265de297031a161.tar.gz
samba-7b9a53b68079231fc0c65ee4a265de297031a161.tar.bz2
samba-7b9a53b68079231fc0c65ee4a265de297031a161.zip
reply.c: Fix bugs where debug statements were accessing the fd_ptr struct
internals after Andrews' code had memset it to zero (this was causing core dumps). charcnv.c: Fixes for ISO8859-2 from Petr Hubeny <psh@capitol.cz>. Jeremy. (This used to be commit df8783ca76d543d200c743f515a185cfea2880df)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/reply.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index eaf3fe9920..2c4800b1c2 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2386,16 +2386,16 @@ int reply_close(char *inbuf,char *outbuf, int dum_size, int dum_buffsize)
/* try and set the date */
set_filetime(cnum, Files[fnum].name,mtime);
+ DEBUG(3,("%s close fd=%d fnum=%d cnum=%d (numopen=%d)\n",
+ timestring(),Files[fnum].fd_ptr->fd,fnum,cnum,
+ Connections[cnum].num_files_open));
+
close_file(fnum,True);
/* We have a cached error */
if(eclass || err)
return(ERROR(eclass,err));
- DEBUG(3,("%s close fd=%d fnum=%d cnum=%d (numopen=%d)\n",
- timestring(),Files[fnum].fd_ptr->fd,fnum,cnum,
- Connections[cnum].num_files_open));
-
return(outsize);
}
@@ -2669,10 +2669,10 @@ int reply_printclose(char *inbuf,char *outbuf, int dum_size, int dum_buffsize)
if (!CAN_PRINT(cnum))
return(ERROR(ERRDOS,ERRnoaccess));
- close_file(fnum,True);
-
DEBUG(3,("%s printclose fd=%d fnum=%d cnum=%d\n",timestring(),Files[fnum].fd_ptr->fd,fnum,cnum));
+ close_file(fnum,True);
+
return(outsize);
}