author | Milan Jurik <Milan.Jurik@oracle.com> |
Wed, 15 Jun 2011 01:09:08 -0700 | |
changeset 305 | e95b65443448 |
child 1343 | a66d36656846 |
permissions | -rw-r--r-- |
305
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
1 |
--- proftpd-1.3.3e/modules/mod_core.c Sun Feb 20 18:36:38 2011 |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
2 |
+++ proftpd-1.3.3e/modules/mod_core.c Tue Jun 7 02:34:09 2011 |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
3 |
@@ -3974,11 +3974,13 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
4 |
dir = dir_canonical_path(cmd->tmp_pool, dir); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
5 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
6 |
if (!dir) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
7 |
+ cmd->error_code = EINVAL; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
8 |
pr_response_add_err(R_550, "%s: %s", cmd->arg, strerror(EINVAL)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
9 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
10 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
11 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
12 |
if (!dir_check_canon(cmd->tmp_pool, cmd, cmd->group, dir, NULL)) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
13 |
+ cmd->error_code = EACCES; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
14 |
pr_response_add_err(R_550, "%s: %s", cmd->arg, strerror(EACCES)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
15 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
16 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
17 |
@@ -3985,6 +3987,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
18 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
19 |
if (pr_fsio_rmdir(dir) < 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
20 |
int xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
21 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
22 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
23 |
(void) pr_trace_msg("fileperms", 1, "%s, user '%s' (UID %lu, GID %lu): " |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
24 |
"error removing directory '%s': %s", cmd->argv[0], session.user, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
25 |
@@ -4033,11 +4036,13 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
26 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
27 |
dir = dir_canonical_path(cmd->tmp_pool, dir); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
28 |
if (!dir) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
29 |
+ cmd->error_code = EINVAL; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
30 |
pr_response_add_err(R_550, "%s: %s", cmd->arg, strerror(EINVAL)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
31 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
32 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
33 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
34 |
if (!dir_check_canon(cmd->tmp_pool, cmd, cmd->group, dir, NULL)) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
35 |
+ cmd->error_code = EACCES; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
36 |
pr_log_debug(DEBUG8, "%s command denied by <Limit> config", cmd->argv[0]); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
37 |
pr_response_add_err(R_550, "%s: %s", cmd->arg, strerror(EACCES)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
38 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
39 |
@@ -4045,6 +4050,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
40 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
41 |
if (pr_fsio_mkdir(dir, 0777) < 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
42 |
int xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
43 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
44 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
45 |
(void) pr_trace_msg("fileperms", 1, "%s, user '%s' (UID %lu, GID %lu): " |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
46 |
"error making directory '%s': %s", cmd->argv[0], session.user, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
47 |
@@ -4067,6 +4073,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
48 |
if (pr_fsio_chown(dir, session.fsuid, session.fsgid) == -1) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
49 |
iserr++; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
50 |
err = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
51 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
52 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
53 |
PRIVS_RELINQUISH |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
54 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
55 |
@@ -4111,6 +4118,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
56 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
57 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
58 |
if (res == -1) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
59 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
60 |
pr_log_pri(PR_LOG_WARNING, "%schown() failed: %s", |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
61 |
use_root_privs ? "root " : "", strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
62 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
63 |
@@ -4153,6 +4161,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
64 |
if (!path || |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
65 |
!dir_check(cmd->tmp_pool, cmd, cmd->group, path, NULL) || |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
66 |
pr_fsio_stat(path, &st) == -1) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
67 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
68 |
pr_response_add_err(R_550, "%s: %s", cmd->arg, strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
69 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
70 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
71 |
@@ -4251,11 +4260,13 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
72 |
/* If told to delete a symlink, don't delete the file it points to! */ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
73 |
path = dir_canonical_path(cmd->tmp_pool, path); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
74 |
if (!path) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
75 |
+ cmd->error_code = ENOENT; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
76 |
pr_response_add_err(R_550, "%s: %s", cmd->arg, strerror(ENOENT)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
77 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
78 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
79 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
80 |
if (!dir_check_canon(cmd->tmp_pool, cmd, cmd->group, path, NULL)) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
81 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
82 |
pr_log_debug(DEBUG7, "deleting '%s' denied by <Limit> configuration", path); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
83 |
pr_response_add_err(R_550, "%s: %s", cmd->arg, strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
84 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
85 |
@@ -4268,6 +4279,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
86 |
memset(&st, 0, sizeof(st)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
87 |
pr_fs_clear_cache(); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
88 |
if (pr_fsio_lstat(path, &st) < 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
89 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
90 |
pr_log_debug(DEBUG3, "unable to lstat '%s': %s", path, strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
91 |
pr_response_add_err(R_550, "%s: %s", cmd->arg, strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
92 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
93 |
@@ -4278,6 +4290,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
94 |
* EISDIR). |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
95 |
*/ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
96 |
if (S_ISDIR(st.st_mode)) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
97 |
+ cmd->error_code = EISDIR; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
98 |
(void) pr_trace_msg("fileperms", 1, "%s, user '%s' (UID %lu, GID %lu): " |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
99 |
"error deleting '%s': %s", cmd->argv[0], session.user, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
100 |
(unsigned long) session.uid, (unsigned long) session.gid, path, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
101 |
@@ -4291,6 +4304,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
102 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
103 |
if (pr_fsio_unlink(path) < 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
104 |
int xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
105 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
106 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
107 |
(void) pr_trace_msg("fileperms", 1, "%s, user '%s' (UID %lu, GID %lu): " |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
108 |
"error deleting '%s': %s", cmd->argv[0], session.user, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
109 |
@@ -4375,6 +4389,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
110 |
!dir_check_canon(cmd->tmp_pool, cmd, cmd->group, path, NULL) || |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
111 |
pr_fsio_rename(session.xfer.path, path) == -1) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
112 |
int xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
113 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
114 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
115 |
if (xerrno != EXDEV) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
116 |
(void) pr_trace_msg("fileperms", 1, "%s, user '%s' (UID %lu, GID %lu): " |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
117 |
@@ -4391,6 +4406,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
118 |
*/ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
119 |
if (pr_fs_copy_file(session.xfer.path, path) < 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
120 |
xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
121 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
122 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
123 |
(void) pr_trace_msg("fileperms", 1, "%s, user '%s' (UID %lu, GID %lu): " |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
124 |
"error copying '%s' to '%s': %s", cmd->argv[0], session.user, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
125 |
@@ -4404,6 +4420,8 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
126 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
127 |
/* Once copied, unlink the original file. */ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
128 |
if (pr_fsio_unlink(session.xfer.path) < 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
129 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
130 |
+ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
131 |
pr_log_debug(DEBUG0, "error unlinking '%s': %s", session.xfer.path, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
132 |
strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
133 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
134 |
@@ -4458,6 +4476,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
135 |
if (!path || |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
136 |
!dir_check_canon(cmd->tmp_pool, cmd, cmd->group, path, NULL) || |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
137 |
!exists(path)) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
138 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
139 |
pr_response_add_err(R_550, "%s: %s", cmd->arg, strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
140 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
141 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
142 |
--- proftpd-1.3.3e/modules/mod_xfer.c Fri Feb 25 18:46:45 2011 |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
143 |
+++ x/proftpd-1.3.3e/modules/mod_xfer.c Tue Jun 7 03:45:03 2011 |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
144 |
@@ -1180,6 +1180,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
145 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
146 |
if (cmd->argc < 2) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
147 |
pr_response_add_err(R_500, _("'%s' not understood"), get_full_cmd(cmd)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
148 |
+ cmd->error_code = EINVAL; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
149 |
errno = EINVAL; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
150 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
151 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
152 |
@@ -1190,6 +1191,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
153 |
if (!path || |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
154 |
!dir_check(cmd->tmp_pool, cmd, cmd->group, path, NULL)) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
155 |
int xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
156 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
157 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
158 |
pr_response_add_err(R_550, "%s: %s", cmd->arg, strerror(xerrno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
159 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
160 |
@@ -1200,6 +1202,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
161 |
if (xfer_check_limit(cmd) < 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
162 |
pr_response_add_err(R_451, _("%s: Too many transfers"), cmd->arg); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
163 |
errno = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
164 |
+ cmd->error_code = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
165 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
166 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
167 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
168 |
@@ -1212,6 +1215,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
169 |
pr_log_debug(DEBUG6, "AllowOverwrite denied permission for %s", cmd->arg); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
170 |
pr_response_add_err(R_550, _("%s: Overwrite permission denied"), cmd->arg); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
171 |
errno = EACCES; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
172 |
+ cmd->error_code = EACCES; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
173 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
174 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
175 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
176 |
@@ -1233,6 +1237,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
177 |
) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
178 |
pr_response_add_err(R_550, _("%s: Not a regular file"), cmd->arg); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
179 |
errno = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
180 |
+ cmd->error_code = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
181 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
182 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
183 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
184 |
@@ -1250,6 +1255,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
185 |
cmd->arg); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
186 |
session.restart_pos = 0L; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
187 |
session.xfer.xfer_type = STOR_DEFAULT; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
188 |
+ cmd->error_code = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
189 |
errno = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
190 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
191 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
192 |
@@ -1256,9 +1262,11 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
193 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
194 |
/* Otherwise everthing is good */ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
195 |
if (pr_table_add(cmd->notes, "mod_xfer.store-path", |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
196 |
- pstrdup(cmd->pool, path), 0) < 0) |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
197 |
+ pstrdup(cmd->pool, path), 0) < 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
198 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
199 |
pr_log_pri(PR_LOG_NOTICE, "notice: error adding 'mod_xfer.store-path': %s", |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
200 |
strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
201 |
+ } |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
202 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
203 |
c = find_config(CURRENT_CONF, CONF_PARAM, "HiddenStores", FALSE); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
204 |
if (c && |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
205 |
@@ -1269,6 +1277,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
206 |
if (session.restart_pos) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
207 |
pr_response_add_err(R_501, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
208 |
_("REST not compatible with server configuration")); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
209 |
+ cmd->error_code = EINVAL; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
210 |
errno = EINVAL; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
211 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
212 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
213 |
@@ -1333,6 +1342,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
214 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
215 |
tmpfd = mkstemp(filename); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
216 |
if (tmpfd < 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
217 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
218 |
pr_log_pri(PR_LOG_ERR, "error: unable to use mkstemp(): %s", |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
219 |
strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
220 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
221 |
@@ -1357,6 +1367,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
222 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
223 |
if (!filename || |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
224 |
!dir_check(cmd->tmp_pool, cmd, cmd->group, filename, NULL)) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
225 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
226 |
int xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
227 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
228 |
/* Do not forget to delete the file created by mkstemp(3) if there is |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
229 |
@@ -1434,6 +1445,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
230 |
if (xfer_check_limit(cmd) < 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
231 |
pr_response_add_err(R_451, _("%s: Too many transfers"), cmd->arg); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
232 |
errno = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
233 |
+ cmd->error_code = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
234 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
235 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
236 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
237 |
@@ -1487,6 +1499,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
238 |
O_WRONLY|(session.restart_pos ? 0 : O_CREAT|O_EXCL)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
239 |
if (stor_fh == NULL) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
240 |
ferrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
241 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
242 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
243 |
(void) pr_trace_msg("fileperms", 1, "%s, user '%s' (UID %lu, GID %lu): " |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
244 |
"error opening '%s': %s", cmd->argv[0], session.user, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
245 |
@@ -1499,6 +1512,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
246 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
247 |
if (stor_fh) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
248 |
if (pr_fsio_lseek(stor_fh, 0, SEEK_END) == (off_t) -1) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
249 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
250 |
pr_log_debug(DEBUG4, "unable to seek to end of '%s' for appending: %s", |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
251 |
cmd->arg, strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
252 |
(void) pr_fsio_close(stor_fh); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
253 |
@@ -1507,6 +1521,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
254 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
255 |
} else { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
256 |
ferrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
257 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
258 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
259 |
(void) pr_trace_msg("fileperms", 1, "%s, user '%s' (UID %lu, GID %lu): " |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
260 |
"error opening '%s': %s", cmd->argv[0], session.user, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
261 |
@@ -1520,6 +1535,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
262 |
O_WRONLY|(session.restart_pos ? 0 : O_TRUNC|O_CREAT)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
263 |
if (stor_fh == NULL) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
264 |
ferrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
265 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
266 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
267 |
(void) pr_trace_msg("fileperms", 1, "%s, user '%s' (UID %lu, GID %lu): " |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
268 |
"error opening '%s': %s", cmd->argv[0], session.user, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
269 |
@@ -1533,11 +1549,13 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
270 |
int xerrno = 0; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
271 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
272 |
if (pr_fsio_lseek(stor_fh, session.restart_pos, SEEK_SET) == -1) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
273 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
274 |
pr_log_debug(DEBUG4, "unable to seek to position %" PR_LU " of '%s': %s", |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
275 |
(pr_off_t) session.restart_pos, cmd->arg, strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
276 |
xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
277 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
278 |
} else if (pr_fsio_stat(path, &st) == -1) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
279 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
280 |
pr_log_debug(DEBUG4, "unable to stat '%s': %s", cmd->arg, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
281 |
strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
282 |
xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
283 |
@@ -1665,6 +1683,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
284 |
res = pr_fsio_write(stor_fh, lbuf, len); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
285 |
if (res != len) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
286 |
int xerrno = EIO; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
287 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
288 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
289 |
if (res < 0) |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
290 |
xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
291 |
@@ -1716,16 +1735,19 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
292 |
*/ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
293 |
#if defined(EDQUOT) |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
294 |
if (errno == EDQUOT) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
295 |
+ cmd->error_code = EDQUOT; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
296 |
pr_response_add_err(R_552, "%s: %s", cmd->arg, strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
297 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
298 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
299 |
#elif defined(EFBIG) |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
300 |
if (errno == EFBIG) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
301 |
+ cmd->error_code = EFBIG; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
302 |
pr_response_add_err(R_552, "%s: %s", cmd->arg, strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
303 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
304 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
305 |
#endif |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
306 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
307 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
308 |
pr_response_add_err(R_550, "%s: %s", cmd->arg, strerror(errno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
309 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
310 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
311 |
@@ -1733,6 +1755,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
312 |
if (session.xfer.path && |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
313 |
session.xfer.path_hidden) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
314 |
if (pr_fsio_rename(session.xfer.path_hidden, session.xfer.path) != 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
315 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
316 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
317 |
/* This should only fail on a race condition with a chmod/chown |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
318 |
* or if STOR_APPEND is on and the permissions are squirrely. |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
319 |
@@ -1830,6 +1853,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
320 |
if (cmd->argc < 2) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
321 |
pr_response_add_err(R_500, _("'%s' not understood"), get_full_cmd(cmd)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
322 |
errno = EINVAL; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
323 |
+ cmd->error_code = EINVAL; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
324 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
325 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
326 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
327 |
@@ -1839,6 +1863,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
328 |
if (!dir || |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
329 |
!dir_check(cmd->tmp_pool, cmd, cmd->group, dir, NULL)) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
330 |
int xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
331 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
332 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
333 |
pr_response_add_err(R_550, "%s: %s", cmd->arg, strerror(xerrno)); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
334 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
335 |
@@ -1849,6 +1874,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
336 |
if (xfer_check_limit(cmd) < 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
337 |
pr_response_add_err(R_451, _("%s: Too many transfers"), cmd->arg); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
338 |
errno = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
339 |
+ cmd->error_code = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
340 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
341 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
342 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
343 |
@@ -1865,6 +1891,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
344 |
) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
345 |
pr_response_add_err(R_550, _("%s: Not a regular file"), cmd->arg); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
346 |
errno = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
347 |
+ cmd->error_code = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
348 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
349 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
350 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
351 |
@@ -1879,6 +1906,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
352 |
cmd->arg); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
353 |
session.restart_pos = 0L; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
354 |
errno = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
355 |
+ cmd->error_code = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
356 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
357 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
358 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
359 |
@@ -1908,6 +1936,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
360 |
retr_fh = pr_fsio_open(dir, O_RDONLY); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
361 |
if (retr_fh == NULL) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
362 |
int xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
363 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
364 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
365 |
(void) pr_trace_msg("fileperms", 1, "%s, user '%s' (UID %lu, GID %lu): " |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
366 |
"error opening '%s': %s", cmd->argv[0], session.user, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
367 |
@@ -1921,6 +1950,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
368 |
if (pr_fsio_stat(dir, &st) < 0) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
369 |
/* Error stat'ing the file. */ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
370 |
int xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
371 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
372 |
pr_fsio_close(retr_fh); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
373 |
errno = xerrno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
374 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
375 |
@@ -1945,6 +1975,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
376 |
if (pr_fsio_lseek(retr_fh, session.restart_pos, |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
377 |
SEEK_SET) == (off_t) -1) { |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
378 |
int xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
379 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
380 |
pr_fsio_close(retr_fh); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
381 |
errno = xerrno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
382 |
retr_fh = NULL; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
383 |
@@ -2003,6 +2034,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
384 |
retr_abort(); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
385 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
386 |
/* Set errno to EPERM ("Operation not permitted") */ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
387 |
+ cmd->error_code = EPERM; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
388 |
pr_data_abort(EPERM, FALSE); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
389 |
return PR_ERROR(cmd); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
390 |
} |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
391 |
@@ -2034,6 +2066,7 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
392 |
* is preserved; errno itself might be overwritten in retr_abort(). |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
393 |
*/ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
394 |
int xerrno = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
395 |
+ cmd->error_code = errno; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
396 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
397 |
retr_abort(); |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
398 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
399 |
--- proftpd-1.3.3e/include/dirtree.h Fri Mar 25 17:49:04 2011 |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
400 |
+++ x/proftpd-1.3.3e/include/dirtree.h Tue Jun 7 02:07:51 2011 |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
401 |
@@ -113,6 +113,8 @@ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
402 |
int class; /* The command class */ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
403 |
int stash_index; /* hack to speed up symbol hashing in modules.c */ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
404 |
pr_table_t *notes; /* Private data for passing/retaining between handlers */ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
405 |
+ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
406 |
+ int error_code; /* stores errno of failed file transfer commands*/ |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
407 |
} cmd_rec; |
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
408 |
|
e95b65443448
PSARC 2011/088 Replace WU-ftpd with modern FTP server proftpd
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff
changeset
|
409 |
struct config_struc { |