diff options
| author | Jeremy Allison <jra@samba.org> | 2001-09-05 23:39:39 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-09-05 23:39:39 +0000 |
| commit | 238cd342a08d32775297154687e4caa0655ca88e (patch) | |
| tree | b61900af79d694b2dd4cabf419912b6f0d1a51f2 /source/smbd/error.c | |
| parent | 60713712dfdebb7bf9e0de89888e3b79e52dc420 (diff) | |
| download | samba-238cd342a08d32775297154687e4caa0655ca88e.tar.gz samba-238cd342a08d32775297154687e4caa0655ca88e.tar.xz samba-238cd342a08d32775297154687e4caa0655ca88e.zip | |
Added __FILE__ to error macros. Added delete on close for NT passthrough
modes to printing.
Jeremy.
Diffstat (limited to 'source/smbd/error.c')
| -rw-r--r-- | source/smbd/error.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/smbd/error.c b/source/smbd/error.c index 16e03792ca1..164f4e42a56 100644 --- a/source/smbd/error.c +++ b/source/smbd/error.c @@ -61,7 +61,7 @@ struct { Create an error packet from errno. ****************************************************************************/ -int unix_error_packet(char *outbuf,int def_class,uint32 def_code,int line) +int unix_error_packet(char *outbuf,int def_class,uint32 def_code,int line, const char *file) { int eclass=def_class; int ecode=def_code; @@ -83,14 +83,14 @@ int unix_error_packet(char *outbuf,int def_class,uint32 def_code,int line) } } - return(error_packet(outbuf,0,eclass,ecode,line)); + return(error_packet(outbuf,0,eclass,ecode,line,file)); } /**************************************************************************** Create an error packet. Normally called using the ERROR() macro. ****************************************************************************/ -int error_packet(char *outbuf,uint32 nt_err, int error_class,uint32 error_code,int line) +int error_packet(char *outbuf,uint32 nt_err, int error_class,uint32 error_code,int line, const char *file) { int outsize = set_message(outbuf,0,0,True); int cmd = CVAL(outbuf,smb_com); @@ -102,14 +102,14 @@ int error_packet(char *outbuf,uint32 nt_err, int error_class,uint32 error_code,i SSVAL(outbuf, smb_flg2, SVAL(outbuf, smb_flg2) | FLAGS2_32_BIT_ERROR_CODES); SIVAL(outbuf,smb_rcls,nt_err); - DEBUG( 3, ( "32 bit error packet at line %d cmd=%d (%s) eclass=%08x [%s]\n", - line, cmd, smb_fn_name(cmd), nt_err, smb_errstr(outbuf) ) ); + DEBUG( 3, ( "32 bit error packet at %s(%d) cmd=%d (%s) eclass=%08x [%s]\n", + file, line, cmd, smb_fn_name(cmd), nt_err, smb_errstr(outbuf) ) ); } else { CVAL(outbuf,smb_rcls) = error_class; SSVAL(outbuf,smb_err,error_code); - DEBUG( 3, ( "error packet at line %d cmd=%d (%s) eclass=%d ecode=%d\n", - line, cmd, smb_fn_name(cmd), error_class, error_code ) ); + DEBUG( 3, ( "error packet at %s(%d) cmd=%d (%s) eclass=%d ecode=%d\n", + file, line, cmd, smb_fn_name(cmd), error_class, error_code ) ); } return(outsize); |