This commit is contained in:
parent
915fc9626d
commit
6cd1b030f0
@ -28,7 +28,7 @@ Index: vsftpd-3.0.2/str.c
|
|||||||
/* Ick. Its for die() */
|
/* Ick. Its for die() */
|
||||||
#include "utility.h"
|
#include "utility.h"
|
||||||
#include "sysutil.h"
|
#include "sysutil.h"
|
||||||
@@ -781,3 +787,47 @@ str_basename (struct mystr* d_str, const
|
@@ -781,3 +787,52 @@ str_basename (struct mystr* d_str, const
|
||||||
if (str_isempty(d_str))
|
if (str_isempty(d_str))
|
||||||
str_copy (d_str, path);
|
str_copy (d_str, path);
|
||||||
}
|
}
|
||||||
@ -68,6 +68,11 @@ Index: vsftpd-3.0.2/str.c
|
|||||||
+ {
|
+ {
|
||||||
+ str_append_text(&tmp, filename);
|
+ str_append_text(&tmp, filename);
|
||||||
+ }
|
+ }
|
||||||
|
+ /* TODO: here we should run one more stat to determine if the whole thing
|
||||||
|
+ * is a directory and append trailing / (ie. /home -> /home/).
|
||||||
|
+ * This will make the deny_file=/home/<REGEXP> work contrary to currently
|
||||||
|
+ * needed /home<REGEXP>.
|
||||||
|
+ */
|
||||||
+ str_copy(filepath, &tmp);
|
+ str_copy(filepath, &tmp);
|
||||||
+out:
|
+out:
|
||||||
+ free(normdir);
|
+ free(normdir);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user