Attachment 613715 Details for Bug 845051 – The patch backports passive mode handling from rhel-6

[patch] The patch backports passive mode handling from rhel-6

vsftpd-2.0.5-pasv_ports.patch (text/plain), 17.27 KB, created by Jiri Skala on 2012-09-17 15:38:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Skala

Created: 2012-09-17 15:38:11 UTC

Size: 17.27 KB

patch

obsolete

>diff -up vsftpd-2.0.5/ftpdataio.c.pasv_ports vsftpd-2.0.5/ftpdataio.c
>--- vsftpd-2.0.5/ftpdataio.c.pasv_ports	2012-09-14 16:20:17.125888600 +0200
>+++ vsftpd-2.0.5/ftpdataio.c	2012-09-14 16:20:30.101876739 +0200
>@@ -82,32 +82,27 @@ int
> vsf_ftpdataio_get_pasv_fd(struct vsf_session* p_sess)
> {
>   int remote_fd;
>-  struct vsf_sysutil_sockaddr* p_accept_addr = 0;
>-  vsf_sysutil_sockaddr_alloc(&p_accept_addr);
>-  remote_fd = vsf_sysutil_accept_timeout(p_sess->pasv_listen_fd, p_accept_addr,
>-                                         tunable_accept_timeout);
>-  if (vsf_sysutil_retval_is_error(remote_fd))
>+  if (tunable_one_process_model)
>+  {
>+    remote_fd = vsf_one_process_get_pasv_fd(p_sess);
>+  }
>+  else
>+  {
>+    remote_fd = vsf_two_process_get_pasv_fd(p_sess);
>+  }
>+  /* Yes, yes, hardcoded bad I know. */
>+  if (remote_fd == -1)
>   {
>     vsf_cmdio_write(p_sess, FTP_BADSENDCONN,
>                     "Failed to establish connection.");
>-    vsf_sysutil_sockaddr_clear(&p_accept_addr);
>     return remote_fd;
>   }
>-  /* SECURITY:
>-   * Reject the connection if it wasn't from the same IP as the
>-   * control connection.
>-   */
>-  if (!tunable_pasv_promiscuous)
>+  else if (remote_fd == -2)
>   {
>-    if (!vsf_sysutil_sockaddr_addr_equal(p_sess->p_remote_addr, p_accept_addr))
>-    {
>-      vsf_cmdio_write(p_sess, FTP_BADSENDCONN, "Security: Bad IP connecting.");
>-      vsf_sysutil_close(remote_fd);
>-      vsf_sysutil_sockaddr_clear(&p_accept_addr);
>-      return -1;
>-    }
>+    vsf_cmdio_write(p_sess, FTP_BADSENDCONN, "Security: Bad IP connecting.");
>+    vsf_sysutil_close(remote_fd);
>+    return -1;
>   }
>-  vsf_sysutil_sockaddr_clear(&p_accept_addr);
>   init_data_sock_params(p_sess, remote_fd);
>   return remote_fd;
> }
>diff -up vsftpd-2.0.5/oneprocess.c.pasv_ports vsftpd-2.0.5/oneprocess.c
>--- vsftpd-2.0.5/oneprocess.c.pasv_ports	2004-07-02 13:23:51.000000000 +0200
>+++ vsftpd-2.0.5/oneprocess.c	2012-09-14 16:20:08.493896481 +0200
>@@ -89,6 +89,31 @@ vsf_one_process_get_priv_data_sock(struc
> }
> 
> void
>+vsf_one_process_pasv_cleanup(struct vsf_session* p_sess)
>+{
>+  vsf_privop_pasv_cleanup(p_sess);
>+}
>+
>+int
>+vsf_one_process_pasv_active(struct vsf_session* p_sess)
>+{
>+  return vsf_privop_pasv_active(p_sess);
>+}
>+
>+unsigned short
>+vsf_one_process_listen(struct vsf_session* p_sess)
>+{
>+  return vsf_privop_pasv_listen(p_sess);
>+}
>+
>+int
>+vsf_one_process_get_pasv_fd(struct vsf_session* p_sess)
>+{
>+  return vsf_privop_accept_pasv(p_sess);
>+}
>+
>+
>+void
> vsf_one_process_chown_upload(struct vsf_session* p_sess, int fd)
> {
>   vsf_privop_do_file_chown(p_sess, fd);
>diff -up vsftpd-2.0.5/oneprocess.h.pasv_ports vsftpd-2.0.5/oneprocess.h
>--- vsftpd-2.0.5/oneprocess.h.pasv_ports	2001-05-16 00:23:57.000000000 +0200
>+++ vsftpd-2.0.5/oneprocess.h	2012-09-14 16:20:08.494896480 +0200
>@@ -34,6 +34,44 @@ void vsf_one_process_login(struct vsf_se
>  */
> int vsf_one_process_get_priv_data_sock(struct vsf_session* p_sess);
> 
>+/* vsf_one_process_pasv_cleanup()
>+ * PURPOSE
>+ * Clean up any listening passive socket.
>+ * PARAMETERS
>+ * p_sess       - the current session object
>+ */
>+void vsf_one_process_pasv_cleanup(struct vsf_session* p_sess);
>+
>+/* vsf_one_process_pasv_active()
>+ * PURPOSE
>+ * Determine whether a listening pasv socket is active.
>+ * PARAMETERS
>+ * p_sess       - the current session object
>+ * RETURNS
>+ * 1 if active, 0 if not.
>+ */
>+int vsf_one_process_pasv_active(struct vsf_session* p_sess);
>+
>+/* vsf_one_process_listen()
>+ * PURPOSE
>+ * Start listening for an incoming connection.
>+ * PARAMETERS
>+ * p_sess       - the current session object
>+ * RETURNS
>+ * The port we listened on.
>+ */
>+unsigned short vsf_one_process_listen(struct vsf_session* p_sess);
>+
>+/* vsf_one_process_get_pasv_fd()
>+ * PURPOSE
>+ * Accept an incoming connection.
>+ * PARAMETERS
>+ * p_sess       - the current session object
>+ * RETURNS
>+ * The file descriptor for the incoming connection.
>+ */
>+int vsf_one_process_get_pasv_fd(struct vsf_session* p_sess);
>+
> /* vsf_one_process_chown_upload()
>  * PURPOSE
>  * Change ownership of an uploaded file using the one process model.
>diff -up vsftpd-2.0.5/postlogin.c.pasv_ports vsftpd-2.0.5/postlogin.c
>--- vsftpd-2.0.5/postlogin.c.pasv_ports	2012-09-14 16:20:08.471896502 +0200
>+++ vsftpd-2.0.5/postlogin.c	2012-09-14 16:20:08.495896479 +0200
>@@ -466,9 +466,16 @@ static int
> pasv_active(struct vsf_session* p_sess)
> {
>   int ret = 0;
>-  if (p_sess->pasv_listen_fd != -1)
>+  if (tunable_one_process_model)
>+  {
>+    ret = vsf_one_process_pasv_active(p_sess);
>+  }
>+  else
>+  {
>+    ret = vsf_two_process_pasv_active(p_sess);
>+  }
>+  if (ret)
>   {
>-    ret = 1;
>     if (port_active(p_sess))
>     {
>       bug("pasv and port both active");
>@@ -486,20 +493,22 @@ port_cleanup(struct vsf_session* p_sess)
> static void
> pasv_cleanup(struct vsf_session* p_sess)
> {
>-  if (p_sess->pasv_listen_fd != -1)
>+  if (tunable_one_process_model)
>   {
>-    vsf_sysutil_close(p_sess->pasv_listen_fd);
>-    p_sess->pasv_listen_fd = -1;
>+    vsf_one_process_pasv_cleanup(p_sess);
>+  }
>+  else
>+  {
>+    vsf_two_process_pasv_cleanup(p_sess);
>   }
> }
> 
> static void
> handle_pasv(struct vsf_session* p_sess, int is_epsv)
> {
>+  unsigned short the_port;
>   static struct mystr s_pasv_res_str;
>   static struct vsf_sysutil_sockaddr* s_p_sockaddr;
>-  int bind_retries = 10;
>-  unsigned short the_port = 0;
>   int is_ipv6 = vsf_sysutil_sockaddr_is_ipv6(p_sess->p_local_addr);
>   if (is_epsv && !str_isempty(&p_sess->ftp_arg_str))
>   {
>@@ -520,59 +529,14 @@ handle_pasv(struct vsf_session* p_sess,
>   }
>   pasv_cleanup(p_sess);
>   port_cleanup(p_sess);
>-  if (is_ipv6)
>+
>+  if (tunable_one_process_model)
>   {
>-    p_sess->pasv_listen_fd = vsf_sysutil_get_ipv6_sock();
>+    the_port = vsf_one_process_listen(p_sess);
>   }
>   else
>   {
>-    p_sess->pasv_listen_fd = vsf_sysutil_get_ipv4_sock();
>-  }
>-  vsf_sysutil_activate_reuseaddr(p_sess->pasv_listen_fd);
>-  while (--bind_retries)
>-  {
>-    int retval;
>-    double scaled_port;
>-    /* IPPORT_RESERVED */
>-    unsigned short min_port = 1024;
>-    unsigned short max_port = 65535;
>-    if (tunable_pasv_min_port > min_port && tunable_pasv_min_port <= max_port)
>-    {
>-      min_port = tunable_pasv_min_port;
>-    }
>-    if (tunable_pasv_max_port >= min_port && tunable_pasv_max_port < max_port)
>-    {
>-      max_port = tunable_pasv_max_port;
>-    }
>-    the_port = vsf_sysutil_get_random_byte();
>-    the_port <<= 8;
>-    the_port |= vsf_sysutil_get_random_byte();
>-    scaled_port = (double) min_port;
>-    scaled_port += ((double) the_port / (double) 65536) *
>-                   ((double) max_port - min_port + 1);
>-    the_port = (unsigned short) scaled_port;
>-    vsf_sysutil_sockaddr_clone(&s_p_sockaddr, p_sess->p_local_addr);
>-    vsf_sysutil_sockaddr_set_port(s_p_sockaddr, the_port);
>-    retval = vsf_sysutil_bind(p_sess->pasv_listen_fd, s_p_sockaddr);
>-    if (!vsf_sysutil_retval_is_error(retval))
>-    {
>-    	retval = vsf_sysutil_listen(p_sess->pasv_listen_fd, 1);
>-    	if (!vsf_sysutil_retval_is_error(retval)) {
>-    	  break;
>-    	}
>-    }
>-	/* try again in case of below two error returns */
>-    if (vsf_sysutil_get_error() == kVSFSysUtilErrADDRINUSE ||
>-			vsf_sysutil_get_error() == kVSFSysUtilErrEACCES)
>-	{
>-		continue;
>-	}
>-    die("vsf_sysutil_bind");
>-  }
>-
>-  if (!bind_retries)
>-  {
>-   	die("vsf_sysutil_bind");
>+    the_port = vsf_two_process_listen(p_sess);
>   }
> 
>   if (is_epsv)
>@@ -585,12 +549,17 @@ handle_pasv(struct vsf_session* p_sess,
>   }
>   if (tunable_pasv_address != 0)
>   {
>+    vsf_sysutil_sockaddr_alloc_ipv4(&s_p_sockaddr);
>     /* Report passive address as specified in configuration */
>     if (vsf_sysutil_inet_aton(tunable_pasv_address, s_p_sockaddr) == 0)
>     {
>       die("invalid pasv_address");
>     }
>   }
>+  else
>+  {
>+    vsf_sysutil_sockaddr_clone(&s_p_sockaddr, p_sess->p_local_addr);
>+  }
>   str_alloc_text(&s_pasv_res_str, "Entering Passive Mode (");
>   if (!is_ipv6)
>   {
>diff -up vsftpd-2.0.5/postprivparent.c.pasv_ports vsftpd-2.0.5/postprivparent.c
>--- vsftpd-2.0.5/postprivparent.c.pasv_ports	2012-09-14 16:20:08.413896555 +0200
>+++ vsftpd-2.0.5/postprivparent.c	2012-09-14 16:20:08.496896479 +0200
>@@ -26,6 +26,10 @@ static void minimize_privilege(struct vs
> static void process_post_login_req(struct vsf_session* p_sess);
> static void cmd_process_chown(struct vsf_session* p_sess);
> static void cmd_process_get_data_sock(struct vsf_session* p_sess);
>+static void cmd_process_pasv_cleanup(struct vsf_session* p_sess);
>+static void cmd_process_pasv_active(struct vsf_session* p_sess);
>+static void cmd_process_pasv_listen(struct vsf_session* p_sess);
>+static void cmd_process_pasv_accept(struct vsf_session* p_sess);
> 
> void
> vsf_priv_parent_postlogin(struct vsf_session* p_sess)
>@@ -54,6 +58,22 @@ process_post_login_req(struct vsf_sessio
>   {
>     cmd_process_get_data_sock(p_sess);
>   }
>+  else if (cmd == PRIV_SOCK_PASV_CLEANUP)
>+  {
>+    cmd_process_pasv_cleanup(p_sess);
>+  }
>+  else if (cmd == PRIV_SOCK_PASV_ACTIVE)
>+  {
>+    cmd_process_pasv_active(p_sess);
>+  }
>+  else if (cmd == PRIV_SOCK_PASV_LISTEN)
>+  {
>+    cmd_process_pasv_listen(p_sess);
>+  }
>+  else if (cmd == PRIV_SOCK_PASV_ACCEPT)
>+  {
>+    cmd_process_pasv_accept(p_sess);
>+  }
>   else
>   {
>     die("bad request in process_post_login_req");
>@@ -112,3 +132,39 @@ cmd_process_get_data_sock(struct vsf_ses
>   vsf_sysutil_close(sock_fd);
> }
> 
>+static void
>+cmd_process_pasv_cleanup(struct vsf_session* p_sess)
>+{
>+  vsf_privop_pasv_cleanup(p_sess);
>+  priv_sock_send_result(p_sess->parent_fd, PRIV_SOCK_RESULT_OK);
>+}
>+
>+static void
>+cmd_process_pasv_active(struct vsf_session* p_sess)
>+{
>+  int active = vsf_privop_pasv_active(p_sess);
>+  priv_sock_send_int(p_sess->parent_fd, active);
>+}
>+
>+static void
>+cmd_process_pasv_listen(struct vsf_session* p_sess)
>+{
>+  unsigned short port = vsf_privop_pasv_listen(p_sess);
>+  priv_sock_send_int(p_sess->parent_fd, port);
>+}
>+
>+static void
>+cmd_process_pasv_accept(struct vsf_session* p_sess)
>+{
>+  int fd = vsf_privop_accept_pasv(p_sess);
>+  if (fd < 0)
>+  {
>+    priv_sock_send_result(p_sess->parent_fd, PRIV_SOCK_RESULT_BAD);
>+    priv_sock_send_int(p_sess->parent_fd, fd);
>+    return;
>+  }
>+  priv_sock_send_result(p_sess->parent_fd, PRIV_SOCK_RESULT_OK);
>+  priv_sock_send_fd(p_sess->parent_fd, fd);
>+  vsf_sysutil_close(fd);
>+}
>+
>diff -up vsftpd-2.0.5/privops.c.pasv_ports vsftpd-2.0.5/privops.c
>--- vsftpd-2.0.5/privops.c.pasv_ports	2006-06-15 00:11:22.000000000 +0200
>+++ vsftpd-2.0.5/privops.c	2012-09-14 16:20:08.496896479 +0200
>@@ -49,6 +49,122 @@ vsf_privop_get_ftp_port_sock(struct vsf_
> }
> 
> void
>+vsf_privop_pasv_cleanup(struct vsf_session* p_sess)
>+{
>+  if (p_sess->pasv_listen_fd != -1)
>+  {
>+    vsf_sysutil_close(p_sess->pasv_listen_fd);
>+    p_sess->pasv_listen_fd = -1;
>+  }
>+}
>+
>+int
>+vsf_privop_pasv_active(struct vsf_session* p_sess)
>+{
>+  if (p_sess->pasv_listen_fd != -1)
>+  {
>+    return 1;
>+  }
>+  return 0;
>+}
>+
>+unsigned short
>+vsf_privop_pasv_listen(struct vsf_session* p_sess)
>+{
>+  static struct vsf_sysutil_sockaddr* s_p_sockaddr;
>+  int bind_retries = 10;
>+  unsigned short the_port = 0;
>+  /* IPPORT_RESERVED */
>+  unsigned short min_port = 1024;
>+  unsigned short max_port = 65535;
>+  int is_ipv6 = vsf_sysutil_sockaddr_is_ipv6(p_sess->p_local_addr);
>+  if (tunable_pasv_min_port > min_port && tunable_pasv_min_port <= max_port)
>+  {
>+    min_port = tunable_pasv_min_port;
>+  }
>+  if (tunable_pasv_max_port >= min_port && tunable_pasv_max_port < max_port)
>+  {
>+    max_port = tunable_pasv_max_port;
>+  }
>+
>+  while (--bind_retries)
>+  {
>+    int retval;
>+    double scaled_port;
>+    if (is_ipv6)
>+    {
>+	p_sess->pasv_listen_fd = vsf_sysutil_get_ipv6_sock();
>+    }
>+    else
>+    {
>+      p_sess->pasv_listen_fd = vsf_sysutil_get_ipv4_sock();
>+    }
>+    vsf_sysutil_activate_reuseaddr(p_sess->pasv_listen_fd);
>+    the_port = vsf_sysutil_get_random_byte();
>+    the_port <<= 8;
>+    the_port |= vsf_sysutil_get_random_byte();
>+    scaled_port = (double) min_port;
>+    scaled_port += ((double) the_port / (double) 65536) *
>+                   ((double) max_port - min_port + 1);
>+    the_port = (unsigned short) scaled_port;
>+    vsf_sysutil_sockaddr_clone(&s_p_sockaddr, p_sess->p_local_addr);
>+    vsf_sysutil_sockaddr_set_port(s_p_sockaddr, the_port);
>+    retval = vsf_sysutil_bind(p_sess->pasv_listen_fd, s_p_sockaddr);
>+    if (!vsf_sysutil_retval_is_error(retval))
>+    {
>+      retval = vsf_sysutil_listen(p_sess->pasv_listen_fd, 1);
>+      if (!vsf_sysutil_retval_is_error(retval))
>+      {
>+        break;
>+      }
>+    }
>+    /* SELinux systems can give you an inopportune EACCES, it seems. */
>+    if (vsf_sysutil_get_error() == kVSFSysUtilErrADDRINUSE ||
>+        vsf_sysutil_get_error() == kVSFSysUtilErrEACCES)
>+    {
>+      vsf_sysutil_close(p_sess->pasv_listen_fd);
>+      continue;
>+    }
>+    die("vsf_sysutil_bind / listen");
>+  }
>+  if (!bind_retries)
>+  {
>+    die("vsf_sysutil_bind");
>+  }
>+  return the_port;
>+}
>+
>+int
>+vsf_privop_accept_pasv(struct vsf_session* p_sess)
>+{
>+  struct vsf_sysutil_sockaddr* p_accept_addr = 0;
>+  int remote_fd;
>+  vsf_sysutil_sockaddr_alloc(&p_accept_addr);
>+  remote_fd = vsf_sysutil_accept_timeout(p_sess->pasv_listen_fd, p_accept_addr,
>+                                         tunable_accept_timeout);
>+  if (vsf_sysutil_retval_is_error(remote_fd))
>+  {
>+    vsf_sysutil_sockaddr_clear(&p_accept_addr);
>+    return -1;
>+  }
>+  /* SECURITY:
>+   * Reject the connection if it wasn't from the same IP as the
>+   * control connection.
>+   */
>+  if (!tunable_pasv_promiscuous)
>+  {
>+    if (!vsf_sysutil_sockaddr_addr_equal(p_sess->p_remote_addr, p_accept_addr))
>+    {
>+      vsf_sysutil_close(remote_fd);
>+      vsf_sysutil_sockaddr_clear(&p_accept_addr);
>+      return -2;
>+    }
>+  }
>+  vsf_sysutil_sockaddr_clear(&p_accept_addr);
>+  return remote_fd;
>+}
>+
>+void
> vsf_privop_do_file_chown(struct vsf_session* p_sess, int fd)
> {
>   static struct vsf_sysutil_statbuf* s_p_statbuf;
>diff -up vsftpd-2.0.5/privsock.h.pasv_ports vsftpd-2.0.5/privsock.h
>--- vsftpd-2.0.5/privsock.h.pasv_ports	2004-06-01 23:45:02.000000000 +0200
>+++ vsftpd-2.0.5/privsock.h	2012-09-14 16:20:08.497896479 +0200
>@@ -111,6 +111,11 @@ int priv_sock_get_int(int fd);
> #define PRIV_SOCK_GET_DATA_SOCK     3
> #define PRIV_SOCK_GET_USER_CMD      4
> #define PRIV_SOCK_WRITE_USER_RESP   5
>+#define PRIV_SOCK_PASV_CLEANUP      10
>+#define PRIV_SOCK_PASV_ACTIVE       11
>+#define PRIV_SOCK_PASV_LISTEN       12
>+#define PRIV_SOCK_PASV_ACCEPT       13
>+
> 
> #define PRIV_SOCK_RESULT_OK         1
> #define PRIV_SOCK_RESULT_BAD        2
>diff -up vsftpd-2.0.5/twoprocess.c.pasv_ports vsftpd-2.0.5/twoprocess.c
>--- vsftpd-2.0.5/twoprocess.c.pasv_ports	2012-09-14 16:20:08.430896539 +0200
>+++ vsftpd-2.0.5/twoprocess.c	2012-09-14 16:20:08.497896479 +0200
>@@ -202,6 +202,49 @@ vsf_two_process_get_priv_data_sock(struc
> }
> 
> void
>+vsf_two_process_pasv_cleanup(struct vsf_session* p_sess)
>+{
>+  char res;
>+  priv_sock_send_cmd(p_sess->child_fd, PRIV_SOCK_PASV_CLEANUP);
>+  res = priv_sock_get_result(p_sess->child_fd);
>+  if (res != PRIV_SOCK_RESULT_OK)
>+  {
>+    die("could not clean up socket");
>+  }
>+}
>+
>+int
>+vsf_two_process_pasv_active(struct vsf_session* p_sess)
>+{
>+  priv_sock_send_cmd(p_sess->child_fd, PRIV_SOCK_PASV_ACTIVE);
>+  return priv_sock_get_int(p_sess->child_fd);
>+}
>+
>+unsigned short
>+vsf_two_process_listen(struct vsf_session* p_sess)
>+{
>+  priv_sock_send_cmd(p_sess->child_fd, PRIV_SOCK_PASV_LISTEN);
>+  return (unsigned short) priv_sock_get_int(p_sess->child_fd);
>+}
>+
>+int
>+vsf_two_process_get_pasv_fd(struct vsf_session* p_sess)
>+{
>+  char res;
>+  priv_sock_send_cmd(p_sess->child_fd, PRIV_SOCK_PASV_ACCEPT);
>+  res = priv_sock_get_result(p_sess->child_fd);
>+  if (res == PRIV_SOCK_RESULT_BAD)
>+  {
>+    return priv_sock_get_int(p_sess->child_fd);
>+  }
>+  else if (res != PRIV_SOCK_RESULT_OK)
>+  {
>+    die("could not accept on listening socket");
>+  }
>+  return priv_sock_recv_fd(p_sess->child_fd);
>+}
>+
>+void
> vsf_two_process_chown_upload(struct vsf_session* p_sess, int fd)
> {
>   char res;
>diff -up vsftpd-2.0.5/twoprocess.h.pasv_ports vsftpd-2.0.5/twoprocess.h
>--- vsftpd-2.0.5/twoprocess.h.pasv_ports	2001-05-16 00:29:01.000000000 +0200
>+++ vsftpd-2.0.5/twoprocess.h	2012-09-14 16:20:08.498896478 +0200
>@@ -33,6 +33,46 @@ void vsf_two_process_login(struct vsf_se
>  */
> int vsf_two_process_get_priv_data_sock(struct vsf_session* p_sess);
> 
>+/* vsf_two_process_pasv_cleanup()
>+ * PURPOSE
>+ * Clean up any listening passive socket in the privileged side.
>+ * PARAMETERS
>+ * p_sess       - the current session object
>+ */
>+void vsf_two_process_pasv_cleanup(struct vsf_session* p_sess);
>+
>+/* vsf_two_process_pasv_active()
>+ * PURPOSE
>+ * Determine if the passive socket is listening on the privileged side.
>+ * PARAMETERS
>+ * p_sess       - the current session object
>+ * RETURNS
>+ * 1 if active, 0 if not.
>+ */
>+int vsf_two_process_pasv_active(struct vsf_session* p_sess);
>+
>+/* vsf_two_process_listen()
>+ * PURPOSE
>+ * Start listening for an incoming connection on the passive socket in the
>+ * privileged side.
>+ * PARAMETERS
>+ * p_sess       - the current session object
>+ * RETURNS
>+ * The port we listened on.
>+ */
>+unsigned short vsf_two_process_listen(struct vsf_session* p_sess);
>+
>+/* vsf_two_process_get_pasv_fd()
>+ * PURPOSE
>+ * Accept an incoming connection on the passive socket in the privileged
>+ * side.
>+ * PARAMETERS
>+ * p_sess       - the current session object
>+ * RETURNS
>+ * The file descriptor for the incoming connection.
>+ */
>+int vsf_two_process_get_pasv_fd(struct vsf_session* p_sess);
>+
> /* vsf_two_process_chown_upload()
>  * PURPOSE
>  * Change ownership of an uploaded file using the two process model.

Actions: View | Diff

Attachments on bug 845051: 613715