← Back to branch summary

~ubuntu-branches/ubuntu/utopic/vsftpd/utopic-proposed

« back to all changes in this revision

Viewing changes to oneprocess.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-21 14:07:17 UTC
  • mfrom: (2.3.10 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100621140717-fnd7ghb4s1vholau
Tags: 2.3.0~pre2-3ubuntu1
https://launchpad.net/bugs/513978
* Merge from debian unstable:
  - Use snakeoil SSL certificates and key.
  - debian/rules, debian/vsftpd.upstart: migrate vsftpd to upstart
  - Add apport hook: (LP: #513978): 
    - debian/vsftpd.apport: Added.
    - debian/control: Build-depends on dh-apport.
    - debian/rules: Add --with apport.
  - Dropped:
    + debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8:
      Use the debian version instead.
  - Add debian/watch file 

Show diffs side-by-side

added added

removed removed

Lines of Context:
oneprocess.c
129
129
vsf_one_process_get_priv_data_sock(struct vsf_session* p_sess)
130
130
{
131
131
  unsigned short port = vsf_sysutil_sockaddr_get_port(p_sess->p_port_sockaddr);
132
 
  return vsf_privop_get_ftp_port_sock(p_sess, port);
 
132
  return vsf_privop_get_ftp_port_sock(p_sess, port, 1);
133
133
}
134
134
 
135
135
void