svn commit: samba r5814 - in trunk/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2005-03-15 23:41:03 +0000 (Tue, 15 Mar 2005)
New Revision: 5814

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5814

Log:
Fix bug found by Jim McDonough <jmcd at us.ibm.com>
Win9x can send a resume name of "..". 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
a file access and replace it with "..".
Jeremy.

Modified:
   trunk/source/smbd/trans2.c


Changeset:
Modified: trunk/source/smbd/trans2.c
===================================================================
--- trunk/source/smbd/trans2.c	2005-03-15 23:40:47 UTC (rev 5813)
+++ trunk/source/smbd/trans2.c	2005-03-15 23:41:03 UTC (rev 5814)
@@ -1569,7 +1569,15 @@
 
 	srvstr_get_path(inbuf, resume_name, params+12, sizeof(resume_name), -1, STR_TERMINATE, &ntstatus, True);
 	if (!NT_STATUS_IS_OK(ntstatus)) {
-		return ERROR_NT(ntstatus);
+		/* Win9x can send a resume name of "..". 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
+		   a file access. JRA. */
+		if (NT_STATUS_V(ntstatus) == NT_STATUS_V(NT_STATUS_OBJECT_PATH_SYNTAX_BAD)) {
+			pstrcpy(resume_name, "..");
+		} else {
+			return ERROR_NT(ntstatus);
+		}
 	}
 
 	DEBUG(3,("call_trans2findnext: dirhandle = %d, max_data_bytes = %d, maxentries = %d, \