diff options
| author | Jeremy Allison <jra@samba.org> | 2004-02-28 00:56:42 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-02-28 00:56:42 +0000 |
| commit | 3c1d00d12a2e3ef2c685c47313487dccae755294 (patch) | |
| tree | 91f5efcb7d6bb2db58eb84eb0815601c9def9694 /source3/smbd/trans2.c | |
| parent | c0b23c6c8c5611cc98861912072b2838f42658f5 (diff) | |
| download | samba-3c1d00d12a2e3ef2c685c47313487dccae755294.tar.gz samba-3c1d00d12a2e3ef2c685c47313487dccae755294.tar.bz2 samba-3c1d00d12a2e3ef2c685c47313487dccae755294.zip | |
More gentest fixes. Fix up regression in IS_NAME_VALID and renames.
Jeremy.
(This used to be commit 367f5c3bc27aafb04f7589b3d4ac5b58189909fb)
Diffstat (limited to 'source3/smbd/trans2.c')
| -rw-r--r-- | source3/smbd/trans2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 63130aa8d8..5fbc5ce6ee 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1830,6 +1830,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, SMB_OFF_T file_size=0; SMB_BIG_UINT allocation_size=0; unsigned int data_size; + unsigned int param_size = 2; SMB_STRUCT_STAT sbuf; pstring fname, dos_fname; char *fullpathname; @@ -1932,7 +1933,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_LSTAT of %s failed (%s)\n",fname,strerror(errno))); return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); } - } else if (!VALID_STAT(sbuf) && SMB_VFS_STAT(conn,fname,&sbuf)) { + } else if (!VALID_STAT(sbuf) && SMB_VFS_STAT(conn,fname,&sbuf) && (info_level != SMB_INFO_IS_NAME_VALID)) { DEBUG(3,("call_trans2qfilepathinfo: SMB_VFS_STAT of %s failed (%s)\n",fname,strerror(errno))); return set_bad_path_error(errno, bad_path, outbuf, ERRDOS,ERRbadpath); } @@ -2016,6 +2017,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, return ERROR_DOS(ERRDOS,ERRbadfunc); } data_size = 0; + param_size = 0; break; case SMB_INFO_QUERY_EAS_FROM_LIST: @@ -2322,7 +2324,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn, return ERROR_DOS(ERRDOS,ERRunknownlevel); } - send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, data_size); + send_trans2_replies(outbuf, bufsize, params, param_size, *ppdata, data_size); return(-1); } |