← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/07-utf8.patch/tunables.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
https://launchpad.net/bugs/1092076
* 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:
.pc/07-utf8.patch/tunables.c
80
80
int tunable_ssl_request_cert;
81
81
int tunable_delete_failed_uploads;
82
82
int tunable_implicit_ssl;
83
 
int tunable_sandbox;
 
83
int tunable_ptrace_sandbox;
84
84
int tunable_require_ssl_reuse;
85
85
int tunable_isolate;
86
86
int tunable_isolate_network;
87
87
int tunable_ftp_enable;
88
88
int tunable_http_enable;
 
89
int tunable_seccomp_sandbox;
 
90
int tunable_allow_writeable_chroot;
89
91
 
90
92
unsigned int tunable_accept_timeout;
91
93
unsigned int tunable_connect_timeout;
178
180
  tunable_use_localtime = 0;
179
181
  tunable_check_shell = 1;
180
182
  tunable_hide_ids = 0;
181
 
  tunable_listen = 0;
 
183
  tunable_listen = 1;
182
184
  tunable_port_promiscuous = 0;
183
185
  tunable_passwd_chroot_enable = 0;
184
186
  tunable_no_anon_password = 0;
218
220
  tunable_ssl_request_cert = 1;
219
221
  tunable_delete_failed_uploads = 0;
220
222
  tunable_implicit_ssl = 0;
221
 
  tunable_sandbox = 0;
 
223
  tunable_ptrace_sandbox = 0;
222
224
  tunable_require_ssl_reuse = 1;
223
225
  tunable_isolate = 1;
224
226
  tunable_isolate_network = 1;
225
227
  tunable_ftp_enable = 1;
226
228
  tunable_http_enable = 0;
 
229
  tunable_seccomp_sandbox = 1;
 
230
  tunable_allow_writeable_chroot = 0;
227
231
 
228
232
  tunable_accept_timeout = 60;
229
233
  tunable_connect_timeout = 60;
280
284
  install_str_setting("/usr/share/ssl/certs/vsftpd.pem",
281
285
                      &tunable_rsa_cert_file);
282
286
  install_str_setting(0, &tunable_dsa_cert_file);
283
 
  install_str_setting("DES-CBC3-SHA", &tunable_ssl_ciphers);
 
287
  install_str_setting("AES128-SHA:DES-CBC3-SHA", &tunable_ssl_ciphers);
284
288
  install_str_setting(0, &tunable_rsa_private_key_file);
285
289
  install_str_setting(0, &tunable_dsa_private_key_file);
286
290
  install_str_setting(0, &tunable_ca_certs_file);