|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
diff -Naupr proftpd-1.3.1rc3.orig/src/fsio.c proftpd-1.3.1rc3/src/fsio.c
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
--- proftpd-1.3.1rc3.orig/src/fsio.c 2007-05-22 22:54:09.000000000 +0200
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
+++ proftpd-1.3.1rc3/src/fsio.c 2007-08-19 18:30:27.000000000 +0200
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
@@ -2579,7 +2579,7 @@ pr_fh_t *pr_fsio_open_canon(const char *
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
pr_trace_msg(trace_channel, 8, "using %s open() for path '%s'", fs->fs_name,
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
name);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
- fh->fh_fd = fs->open(fh, deref, flags);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
+ fh->fh_fd = (fs->open)(fh, deref, flags);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
if (fh->fh_fd == -1) {
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
destroy_pool(fh->fh_pool);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
@@ -2620,7 +2620,7 @@ pr_fh_t *pr_fsio_open(const char *name,
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
pr_trace_msg(trace_channel, 8, "using %s open() for path '%s'", fs->fs_name,
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
name);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
- fh->fh_fd = fs->open(fh, name, flags);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
+ fh->fh_fd = (fs->open)(fh, name, flags);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
if (fh->fh_fd == -1) {
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
destroy_pool(fh->fh_pool);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
diff -Naupr proftpd-1.3.1rc3.orig/src/netio.c proftpd-1.3.1rc3/src/netio.c
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
--- proftpd-1.3.1rc3.orig/src/netio.c 2007-05-15 19:35:05.000000000 +0200
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
+++ proftpd-1.3.1rc3/src/netio.c 2007-08-19 18:24:51.000000000 +0200
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
@@ -390,22 +390,22 @@ pr_netio_stream_t *pr_netio_open(pool *p
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
if (strm_type == PR_NETIO_STRM_CTRL) {
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
nstrm->strm_type = PR_NETIO_STRM_CTRL;
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
nstrm->strm_mode = mode;
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
- return ctrl_netio ? ctrl_netio->open(nstrm, fd, mode) :
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
- core_ctrl_netio->open(nstrm, fd, mode);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
+ return ctrl_netio ? (ctrl_netio->open)(nstrm, fd, mode) :
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
+ (core_ctrl_netio->open)(nstrm, fd, mode);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
}
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
if (strm_type == PR_NETIO_STRM_DATA) {
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
nstrm->strm_type = PR_NETIO_STRM_DATA;
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
nstrm->strm_mode = mode;
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
- return data_netio ? data_netio->open(nstrm, fd, mode) :
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
- core_data_netio->open(nstrm, fd, mode);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
+ return data_netio ? (data_netio->open)(nstrm, fd, mode) :
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
+ (core_data_netio->open)(nstrm, fd, mode);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
}
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
if (strm_type == PR_NETIO_STRM_OTHR) {
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
nstrm->strm_type = PR_NETIO_STRM_OTHR;
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
nstrm->strm_mode = mode;
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
- return othr_netio ? othr_netio->open(nstrm, fd, mode) :
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
- core_othr_netio->open(nstrm, fd, mode);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
+ return othr_netio ? (othr_netio->open)(nstrm, fd, mode) :
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
+ (core_othr_netio->open)(nstrm, fd, mode);
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
}
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
|
|
![](https://seccdn.libravatar.org/avatar/ed94dd58a3358601282fd2feacdbffc77c1f9aea735a594a80503b948d76e18b?s=16&d=retro) |
23b76f9 |
destroy_pool(nstrm->strm_pool);
|