]>
Commit | Line | Data |
---|---|---|
f6c793a8 | 1 | diff -Nru httpd-2.0.48.orig/server/config.c httpd-2.0.48/server/config.c |
2 | --- httpd-2.0.48.orig/server/config.c 2003-10-14 05:43:18.000000000 +0200 | |
3 | +++ httpd-2.0.48/server/config.c 2003-10-28 10:09:44.618490512 +0100 | |
1708c0e6 | 4 | @@ -1537,6 +1537,7 @@ |
9d781f9b MM |
5 | apr_dir_t *dirp; |
6 | apr_finfo_t dirent; | |
7 | int current; | |
f1800b13 | 8 | + size_t slen; |
9d781f9b MM |
9 | apr_array_header_t *candidates = NULL; |
10 | fnames *fnew; | |
1708c0e6 AM |
11 | char *path = apr_pstrdup(p, fname); |
12 | @@ -1563,7 +1564,11 @@ | |
9d781f9b MM |
13 | candidates = apr_array_make(p, 1, sizeof(fnames)); |
14 | while (apr_dir_read(&dirent, APR_FINFO_DIRENT, dirp) == APR_SUCCESS) { | |
9d781f9b | 15 | /* strip out '.' and '..' */ |
1708c0e6 AM |
16 | - if (strcmp(dirent.name, ".") |
17 | + if (strcmp(dirent.name, ".") && (dirent.name)[slen-1] != '~' | |
18 | + && (dirent.name)[0] != '.' | |
19 | + && (slen < 8 || strcmp((dirent.name + slen - 7), ".rpmnew")) | |
20 | + && (slen < 9 || ( strcmp((dirent.name + slen - 8), ".rpmorig") | |
21 | + && strcmp((dirent.name + slen - 8), ".rpmsave"))) | |
f6c793a8 | 22 | && strcmp(dirent.name, "..")) { |
23 | fnew = (fnames *) apr_array_push(candidates); | |
24 | fnew->fname = ap_make_full_path(p, path, dirent.name); |