diff options
| author | Gerald Carter <jerry@samba.org> | 2003-01-15 18:57:41 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-01-15 18:57:41 +0000 |
| commit | 99cdb462083381c88689a4e698ca48b6ed4cf5ac (patch) | |
| tree | 7ea530c74c8fd1ef65eec52410b7843e63d89f8f /source3/libsmb | |
| parent | 35fa2e5975f9b380e6e63471413df6f4182c164b (diff) | |
| download | samba-99cdb462083381c88689a4e698ca48b6ed4cf5ac.tar.gz samba-99cdb462083381c88689a4e698ca48b6ed4cf5ac.tar.bz2 samba-99cdb462083381c88689a4e698ca48b6ed4cf5ac.zip | |
*lots of small merges form HEAD
*sync up configure.in
*don't build torture tools in make all
*make sure to remove torture tools as part of make clean
(This used to be commit 0fb724b3216eeeb97e61ff12755ca3a31bcad6ef)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/clilist.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/clireadwrite.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index bf10be887a..89ab5d6414 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -328,7 +328,7 @@ static int interpret_short_filename(struct cli_state *cli, char *p,file_info *fi strncpy(finfo->short_name,finfo->name, sizeof(finfo->short_name)-1); finfo->short_name[sizeof(finfo->short_name)-1] = '\0'; } - + return(DIR_STRUCT_SIZE); } diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c index fb013734ac..0715aa7f1a 100644 --- a/source3/libsmb/clireadwrite.c +++ b/source3/libsmb/clireadwrite.c @@ -285,10 +285,13 @@ static BOOL cli_issue_write(struct cli_state *cli, int fnum, off_t offset, SIVAL(cli->outbuf,smb_vwv5,0); SSVAL(cli->outbuf,smb_vwv7,mode); + SSVAL(cli->outbuf,smb_vwv8,(mode & 0x0008) ? size : 0); /* - * THe following is still wrong ... + * According to CIFS-TR-1p00, this following field should only + * be set if CAP_LARGE_WRITEX is set. We should check this + * locally. However, this check might already have been + * done by our callers. */ - SSVAL(cli->outbuf,smb_vwv8,(mode & 0x0008) ? size : 0); SSVAL(cli->outbuf,smb_vwv9,((size>>16)&1)); SSVAL(cli->outbuf,smb_vwv10,size); SSVAL(cli->outbuf,smb_vwv11, |