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.

1 files changed, 6 insertions, 6 deletions

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index eaf3fe99206..2c4800b1c22 100644
--- a/source/smbd/reply.c
+++ b/source/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);
 }