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

« back to all changes in this revision

Viewing changes to .pc/07-utf8.patch/features.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Ubuntu Merge-o-Matic
  • Date: 2012-01-23 09:16:04 UTC
  • mfrom: (2.3.15 sid)
  • Revision ID: package-import@ubuntu.com-20120123091604-b3fwc36wtjp9n5wz
Tags: 2.3.5-1ubuntu1
[ Ubuntu Merge-o-Matic ]
* Merge from Debian testing.  Remaining changes:
  + 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.
  + debian/vsftpd.postinst: Check that group exists first,
    then the user, then trying adding the user to the group. (LP: #629234)
  + Add debian/watch file.
  + debian/patches/09-disable-anonymous.patch: Disable anonymous login by default.
    (LP: #528860)

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
  vsf_cmdio_write_hyphen(p_sess, FTP_FEAT, "Features:");
19
19
  if (tunable_ssl_enable)
20
20
  {
21
 
    vsf_cmdio_write_raw(p_sess, " AUTH SSL\r\n");
22
 
    vsf_cmdio_write_raw(p_sess, " AUTH TLS\r\n");
 
21
    if (tunable_sslv2 || tunable_sslv3)
 
22
    {
 
23
      vsf_cmdio_write_raw(p_sess, " AUTH SSL\r\n");
 
24
    }
 
25
    if (tunable_tlsv1)
 
26
    {
 
27
      vsf_cmdio_write_raw(p_sess, " AUTH TLS\r\n");
 
28
    }
23
29
  }
24
30
  if (tunable_port_enable)
25
31
  {