← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/ntp/gutsy

« back to all changes in this revision

Viewing changes to libisc/net.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-05-18 22:41:56 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20070518224156-563ruqxsxvqvoy8h
Tags: 1:4.2.4p0+dfsg-1ubuntu1
* Merge from Debian unstable.
* Remaining Ubuntu changes:
  - Update version in conflicts/replaces to that which was shipped in edgy,
    which was later than that in Debian (due to the ubuntuX).
  - Change default server to ntp.ubuntu.com.
  - Remove stop links from rc0 and rc6
  - Call dh_installinit with --error-handler
  - Set Ubuntu maintainer address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libisc/net.c
77
77
#ifdef ISC_PLATFORM_HAVEIN6PKTINFO
78
78
        if (domain == PF_INET6) {
79
79
                struct sockaddr_in6 sin6;
80
 
                unsigned int len;
 
80
                GETSOCKNAME_SOCKLEN_TYPE len;
81
81
 
82
82
                /*
83
83
                 * Check to see if IPv6 is broken, as is common on Linux.
84
84
                 */
85
85
                len = sizeof(sin6);
86
 
                if (getsockname(s, (struct sockaddr *)&sin6, (void *)&len) < 0)
 
86
                if (getsockname(s, (struct sockaddr *)&sin6, &len) < 0)
87
87
                {
88
88
                        result = ISC_R_NOTFOUND;
89
89
                } else {