← Back to branch summary

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

« back to all changes in this revision

Viewing changes to banner.c

  • Committer: Package Import Robot
  • Author(s): Daniel Llewellyn (Bang Communications)
  • Date: 2013-05-08 14:08:53 UTC
  • mfrom: (2.6.1 squeeze)
  • Revision ID: package-import@ubuntu.com-20130508140853-ahhuki963v9fuuns
Tags: 3.0.2-1ubuntu2
https://launchpad.net/bugs/1160372
* debian/patches/13-disable-clone-newpid.patch
  - patch to remove CLONE_NEWPID syscall
    see: https://bugzilla.novell.com/show_bug.cgi?id=786024#c38
    Fixes LP: #1160372

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
    }