diff options
| author | Jeremy Allison <jra@samba.org> | 2005-03-15 23:46:22 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:03 -0500 |
| commit | 55f480b009a577d47dd7ea430607a91db858485f (patch) | |
| tree | a03885d46eb0b3f035154953341ba18aa5a16b95 | |
| parent | 4f92cefcad567c2098e02d902783ac9e722fd02e (diff) | |
| download | samba-55f480b009a577d47dd7ea430607a91db858485f.tar.gz samba-55f480b009a577d47dd7ea430607a91db858485f.tar.bz2 samba-55f480b009a577d47dd7ea430607a91db858485f.zip | |
r5816: Catch the "." resume name case also.
Jeremy.
(This used to be commit 479bb6ea95e45d6f9d8b5dbddd500451e39202a7)
| -rw-r--r-- | source3/smbd/trans2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index c21fe1113e..54234deb35 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1569,12 +1569,14 @@ static int call_trans2findnext(connection_struct *conn, char *inbuf, char *outbu srvstr_get_path(inbuf, resume_name, params+12, sizeof(resume_name), -1, STR_TERMINATE, &ntstatus, True); if (!NT_STATUS_IS_OK(ntstatus)) { - /* Win9x can send a resume name of "..". This will cause the parser to + /* Win9x or OS/2 can send a resume name of ".." or ".". This will cause the parser to complain (it thinks we're asking for the directory above the shared - path). Catch this as the resume name is only compared, never used in + path or an invalid name). Catch this as the resume name is only compared, never used in a file access. JRA. */ - if (NT_STATUS_V(ntstatus) == NT_STATUS_V(NT_STATUS_OBJECT_PATH_SYNTAX_BAD)) { + if (NT_STATUS_EQUAL(ntstatus,NT_STATUS_OBJECT_PATH_SYNTAX_BAD)) { pstrcpy(resume_name, ".."); + } else if (NT_STATUS_EQUAL(ntstatus,NT_STATUS_OBJECT_NAME_INVALID)) { + pstrcpy(resume_name, "."); } else { return ERROR_NT(ntstatus); } |