Let real users access special files through FTP
if allowed by their filesystem permissions. This doesn't break anything since using sendfile(2) is triggered later by a separate S_ISREG conditional. PR: bin/20824 MFC after: 1 week
This commit is contained in:
parent
9be662a8bd
commit
be2978efdf
@ -1663,10 +1663,20 @@ retrieve(char *cmd, char *name)
|
||||
return;
|
||||
}
|
||||
byte_count = -1;
|
||||
if (cmd == 0 && (fstat(fileno(fin), &st) < 0 || !S_ISREG(st.st_mode))) {
|
||||
if (cmd == 0) {
|
||||
if (fstat(fileno(fin), &st) < 0) {
|
||||
perror_reply(550, name);
|
||||
goto done;
|
||||
}
|
||||
if (!S_ISREG(st.st_mode)) {
|
||||
if (guest) {
|
||||
reply(550, "%s: not a plain file.", name);
|
||||
goto done;
|
||||
}
|
||||
st.st_size = -1;
|
||||
/* st.st_blksize is set for all descriptor types */
|
||||
}
|
||||
}
|
||||
if (restart_point) {
|
||||
if (type == TYPE_A) {
|
||||
off_t i, n;
|
||||
|
Loading…
Reference in New Issue
Block a user