Merge pull request #159 from Castaglia/proxy-dirlist-rfc1918-fallback…

…-issue158 Issue #158: Attempt to address the reported `EINVAL` error, in the RF…
Castaglia · May 30, 2020 · 9610d48 · 9610d48
2 parents 32660d6 + b00b2de
commit 9610d48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mod_proxy.c b/mod_proxy.c
@@ -2760,7 +2760,7 @@ MODRET proxy_eprt(cmd_rec *cmd, struct proxy_session *proxy_sess) {
     const char *rfc1918_ipstr;
 
     rfc1918_ipstr = pr_netaddr_get_ipstr(remote_addr);
-    remote_addr = pr_netaddr_dup(cmd->tmp_pool, session.c->remote_addr);
+    remote_addr = pr_netaddr_dup(session.pool, session.c->remote_addr);
     (void) pr_log_writefile(proxy_logfd, MOD_PROXY_VERSION,
       "client sent RFC1918 address '%s' in EPRT command, ignoring it and "
       "using '%s'", rfc1918_ipstr, pr_netaddr_get_ipstr(remote_addr));
@@ -3190,7 +3190,7 @@ MODRET proxy_port(cmd_rec *cmd, struct proxy_session *proxy_sess) {
     const char *rfc1918_ipstr;
 
     rfc1918_ipstr = pr_netaddr_get_ipstr(remote_addr);
-    remote_addr = pr_netaddr_dup(cmd->tmp_pool, session.c->remote_addr);
+    remote_addr = pr_netaddr_dup(session.pool, session.c->remote_addr);
     (void) pr_log_writefile(proxy_logfd, MOD_PROXY_VERSION,
       "client sent RFC1918 address '%s' in PORT command, ignoring it and "
       "using '%s'", rfc1918_ipstr, pr_netaddr_get_ipstr(remote_addr));

diff --git a/t/api/netio.c b/t/api/netio.c
@@ -1,6 +1,6 @@
 /*
  * ProFTPD - mod_proxy testsuite
- * Copyright (c) 2015-2016 TJ Saunders <tj@castaglia.org>
+ * Copyright (c) 2015-2020 TJ Saunders <tj@castaglia.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -78,7 +78,7 @@ START_TEST (netio_open_test) {
 
   nstrm = proxy_netio_open(p, 77, -1, PR_NETIO_IO_RD);
   fail_unless(nstrm == NULL, "Failed to handle unsupported stream type");
-  fail_unless(errno == EPERM, "Expected EPERM (%d), got '%s' (%d)", EPERM,
+  fail_unless(errno == EINVAL, "Expected EINVAL (%d), got '%s' (%d)", EINVAL,
     strerror(errno), errno);
 
   nstrm = proxy_netio_open(p, PR_NETIO_STRM_OTHR, -1, PR_NETIO_IO_RD);