svn commit: samba r2215 - in branches/SAMBA_3_0/source/smbd: .
jra at samba.org
jra at samba.org
Fri Sep 3 20:05:30 GMT 2004
Author: jra
Date: 2004-09-03 20:05:29 +0000 (Fri, 03 Sep 2004)
New Revision: 2215
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/smbd&rev=2215&nolog=1
Log:
I think I'm really close now. The key is to count the number of
bad components once you've hit one, and keep track of how many
there are (going up a level removes one - maybe it needs to be ./
in order to be removed, need to check). And remember to change the error
code return depending on whether you're called from ff or chkpath.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c 2004-09-03 17:45:08 UTC (rev 2214)
+++ branches/SAMBA_3_0/source/smbd/reply.c 2004-09-03 20:05:29 UTC (rev 2215)
@@ -49,6 +49,7 @@
const char *s = srcname;
NTSTATUS ret = NT_STATUS_OK;
BOOL start_of_name_component = True;
+ unsigned int num_bad_components = 0;
while (*s) {
if (IS_DIRECTORY_SEP(*s)) {
@@ -97,32 +98,21 @@
}
s += 2; /* Else go past the .. */
/* We're still at the start of a name component, just the previous one. */
+
+ if (num_bad_components) {
+ /* Hmmm. Should we only decrement the bad_components if
+ we're removing a bad component ? Need to check this. JRA. */
+ num_bad_components--;
+ }
+
continue;
- } else if ((s[0] == '.') && (s[1] == '\0')) {
+ } else if ((s[0] == '.') && ((s[1] == '\0') || IS_DIRECTORY_SEP(s[1]))) {
/* Component of pathname can't be "." only. */
ret = NT_STATUS_OBJECT_NAME_INVALID;
- break;
- } else if ((s[0] == '.') && IS_DIRECTORY_SEP(s[1])) {
- /*
- * No mb char starts with '.' so we're safe checking the directory separator here.
- */
-
- /* Component of pathname can't be ".\\ANYTHING". */
-
- /* "/./" or "\\.\\" fails with a different error depending on what is after it... */
-
- /* Eat multiple '/' or '\\' */
- for (s++; IS_DIRECTORY_SEP(*s); s++) {
- ;
- }
-
- if (*s == '\0') {
- ret = NT_STATUS_OBJECT_NAME_INVALID;
- } else {
- ret = NT_STATUS_OBJECT_PATH_NOT_FOUND;
- }
- break;
+ num_bad_components++;
+ *d++ = *s++;
+ continue;
}
}
@@ -160,8 +150,25 @@
}
}
start_of_name_component = False;
+ if (num_bad_components) {
+ num_bad_components++;
+ }
}
+ if (NT_STATUS_EQUAL(ret, NT_STATUS_OBJECT_NAME_INVALID)) {
+ /* For some strange reason being called from findfirst changes
+ the num_components number to cause the error return to change. JRA. */
+ if (allow_wcard_names) {
+ if (num_bad_components > 2) {
+ ret = NT_STATUS_OBJECT_PATH_NOT_FOUND;
+ }
+ } else {
+ if (num_bad_components > 1) {
+ ret = NT_STATUS_OBJECT_PATH_NOT_FOUND;
+ }
+ }
+ }
+
*d = '\0';
return ret;
}
More information about the samba-cvs
mailing list