← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/04-link-local.patch/standalone.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/04-link-local.patch/standalone.c
80
80
  {
81
81
    struct vsf_sysutil_sockaddr* p_sockaddr = 0;
82
82
    vsf_sysutil_sockaddr_alloc_ipv4(&p_sockaddr);
83
 
    vsf_sysutil_sockaddr_set_port(p_sockaddr, tunable_listen_port);
 
83
    vsf_sysutil_sockaddr_set_port(p_sockaddr,
 
84
                                  (unsigned short) tunable_listen_port);
84
85
    if (!tunable_listen_address)
85
86
    {
86
87
      vsf_sysutil_sockaddr_set_any(p_sockaddr);
103
104
  {
104
105
    struct vsf_sysutil_sockaddr* p_sockaddr = 0;
105
106
    vsf_sysutil_sockaddr_alloc_ipv6(&p_sockaddr);
106
 
    vsf_sysutil_sockaddr_set_port(p_sockaddr, tunable_listen_port);
 
107
    vsf_sysutil_sockaddr_set_port(p_sockaddr,
 
108
                                  (unsigned short) tunable_listen_port);
107
109
    if (!tunable_listen_address6)
108
110
    {
109
111
      vsf_sysutil_sockaddr_set_any(p_sockaddr);
272
274
  unsigned int i;
273
275
  for (i = 0; i < s_ipaddr_size; ++i)
274
276
  {
275
 
    val ^= p_raw_ip[i] << shift;
 
277
    val = val ^ (unsigned int) (p_raw_ip[i] << shift);
276
278
    shift -= 8;
277
279
    if (shift < 0)
278
280
    {