~ubuntu-branches/ubuntu/trusty/vsftpd/trusty-proposed

« back to all changes in this revision

Viewing changes to parseconf.c

  • Committer: Package Import Robot
  • Author(s): Lorenzo De Liso
  • Date: 2012-12-18 19:59:37 UTC
  • mfrom: (2.3.22 sid)
  • Revision ID: package-import@ubuntu.com-20121218195937-xiwdrfndhhvv87s0
Tags: 3.0.2-1ubuntu1
* Merge from debian unstable (LP: #1092076), remaining changes:
  - Use snakeoil SSL certificates and key.
  - debian/rules, debian/vsftpd.upstart: migrate vsftpd to upstart.
  - Add apport hook:
    + debian/vsftpd.apport: Added.
    + debian/control: Build-depends on dh-apport.
    + debian/rules: Add --with apport.
  - Add debian/watch file.
  - debian/patches/09-disable-anonymous.patch: Disable anonymous login by 
    default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
100
100
  { "ssl_request_cert", &tunable_ssl_request_cert },
101
101
  { "delete_failed_uploads", &tunable_delete_failed_uploads },
102
102
  { "implicit_ssl", &tunable_implicit_ssl },
103
 
  { "sandbox", &tunable_sandbox },
 
103
  { "ptrace_sandbox", &tunable_ptrace_sandbox },
104
104
  { "require_ssl_reuse", &tunable_require_ssl_reuse },
105
105
  { "isolate", &tunable_isolate },
106
106
  { "isolate_network", &tunable_isolate_network },
107
107
  { "ftp_enable", &tunable_ftp_enable },
108
108
  { "http_enable", &tunable_http_enable },
 
109
  { "seccomp_sandbox", &tunable_seccomp_sandbox },
 
110
  { "allow_writeable_chroot", &tunable_allow_writeable_chroot },
109
111
  { 0, 0 }
110
112
};
111
113
 
343
345
        }
344
346
        else
345
347
        {
346
 
          *(p_uint_setting->p_variable) = str_atoi(&s_value_str);
 
348
          /* TODO: we could reject negatives instead of converting them? */
 
349
          *(p_uint_setting->p_variable) = (unsigned int) str_atoi(&s_value_str);
347
350
        }
348
351
        return;
349
352
      }