← Back to branch summary

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

« back to all changes in this revision

Viewing changes to parseconf.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:
parseconf.c
103
103
  { "require_ssl_reuse", &tunable_require_ssl_reuse },
104
104
  { "isolate", &tunable_isolate },
105
105
  { "isolate_network", &tunable_isolate_network },
 
106
  { "ftp_enable", &tunable_ftp_enable },
 
107
  { "http_enable", &tunable_http_enable },
106
108
  { 0, 0 }
107
109
};
108
110