← Back to branch summary

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

« back to all changes in this revision

Viewing changes to banner.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:
banner.c
53
53
     */
54
54
    {
55
55
      struct mystr msg_file_str = INIT_MYSTR;
56
 
      (void) str_fileread(&msg_file_str, tunable_message_file,
57
 
                          VSFTP_MAX_MSGFILE_SIZE);
 
56
      if (tunable_message_file)
 
57
      {
 
58
        (void) str_fileread(&msg_file_str, tunable_message_file,
 
59
                            VSFTP_MAX_MSGFILE_SIZE);
 
60
      }
58
61
      vsf_banner_write(p_sess, &msg_file_str, ftpcode);
59
62
      str_free(&msg_file_str);
60
63
    }