| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Thu, 31 Jul 2014 12:11:52 -0700 | |
| branch | s11u2-sru |
| changeset 3244 | 5fe7a1d88248 |
| parent 3234 | 1de12229da80 |
| permissions | -rw-r--r-- |
|
3234
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
1 |
http://bugs.proftpd.org/show_bug.cgi?id=4069 |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
2 |
https://github.com/proftpd/proftpd/commit/38cf9e5028cbddee2b0dcba436d60199da1edf80 |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
3 |
|
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
4 |
--- a/modules/mod_ls.c |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
5 |
+++ b/modules/mod_ls.c |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
6 |
@@ -2755,6 +2755,13 @@ MODRET ls_nlst(cmd_rec *cmd) {
|
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
7 |
parse_list_opts(&list_options, &glob_flags, TRUE); |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
8 |
} |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
9 |
|
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
10 |
+ /* If, after parsing out any options, the target string is empty, assume |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
11 |
+ * the current directory (Bug#4069). |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
12 |
+ */ |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
13 |
+ if (*target == '\0') {
|
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
14 |
+ target = pstrdup(cmd->tmp_pool, "."); |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
15 |
+ } |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
16 |
+ |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
17 |
/* If the target starts with '~' ... */ |
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
18 |
if (*target == '~') {
|
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
19 |
char pb[PR_TUNABLE_PATH_MAX + 1] = {'\0'};
|
|
1de12229da80
18771389 Update proftpd to 1.3.5
Tomas Klacko <tomas.klacko@oracle.com>
parents:
diff
changeset
|
20 |