← Back to branch summary

~ubuntu-branches/debian/squeeze/ntp/squeeze

« back to all changes in this revision

Viewing changes to lib/isc/win32/interfaceiter.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2010-05-24 11:09:51 UTC
  • mfrom: (1.2.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20100524110951-1o7gh469ygochf4n
Tags: 1:4.2.6.p1+dfsg-1
http://bugs.debian.org/569530
* New upstream version
  - They no longer ship arlib, adjust dfsg.patch.
  - Drop kfreebsd.patch, applied upstream
  - Update patches for upstream changes.
* Remove the obsolete config files:

  for ntp:
  - /etc/logcheck/ignore.d.server/ntp, removed in 1:4.2.6+dfsg-1
  - /etc/dhcp3/dhclient-enter-hooks.d/ntp, replaced by exit hooks in
    1:4.2.4p4+dfsg-3
  - /etc/network/if-up.d/ntp, removed in 1:4.2.4p0+dfsg-1

  for ntpdate:
  - /etc/dhcp3/dhclient-enter-hooks.d/ntpdate, replaced by exit hooks in
    1:4.2.4p4+dfsg-3

  Use dpkg 1.15.7.2's dpkg-maintscript-helper.  This needs
  a Pre-Depends to work, else it's never going to be removed.
  (Closes: #569530)
* Add "Depends: ${misc:Depends}" to ntp-doc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/isc/win32/interfaceiter.c
98
98
                memcpy(&dst->type.in6,
99
99
                       &((struct sockaddr_in6 *) src)->sin6_addr,
100
100
                       sizeof(struct in6_addr));
 
101
#ifdef ISC_PLATFORM_HAVESCOPEID
101
102
                dst->zone = ((struct sockaddr_in6 *) src)->sin6_scope_id;
 
103
#endif
102
104
                break;
103
105
        default:
104
106
                INSIST(0);
371
373
 
372
374
        if ((flags & IFF_POINTTOPOINT) != 0) {
373
375
                iter->current.flags |= INTERFACE_F_POINTTOPOINT;
374
 
                sprintf(iter->current.name, "PPP %d", iter->numIF);
 
376
                snprintf(iter->current.name, sizeof(iter->current.name),
 
377
                         "PPP %d", iter->numIF);
375
378
                ifNamed = TRUE;
376
379
        }
377
380
 
378
381
        if ((flags & IFF_LOOPBACK) != 0) {
379
382
                iter->current.flags |= INTERFACE_F_LOOPBACK;
380
 
                sprintf(iter->current.name, "v4loop %d", 
381
 
                        iter->numIF);
 
383
                snprintf(iter->current.name, sizeof(iter->current.name),
 
384
                        "v4loop %d", iter->numIF);
382
385
                ifNamed = TRUE;
383
386
        }
384
387
 
406
409
                                  &iter->current.netmask);
407
410
 
408
411
        if (ifNamed == FALSE)
409
 
                sprintf(iter->current.name,
 
412
                snprintf(iter->current.name, sizeof(iter->current.name),
410
413
                        "IPv4 %d", iter->numIF);
411
414
 
412
415
        return (ISC_R_SUCCESS);
466
469
                    sizeof(iter->current.address.type.in6))) {
467
470
 
468
471
                iter->current.flags |= INTERFACE_F_LOOPBACK;
469
 
                sprintf(iter->current.name, "v6loop %d", 
470
 
                        iter->buf6->iAddressCount - iter->pos6);
 
472
                snprintf(iter->current.name, sizeof(iter->current.name),
 
473
                         "v6loop %d",
 
474
                         iter->buf6->iAddressCount - iter->pos6);
471
475
                ifNamed = TRUE;
472
476
        }
473
477
 
474
478
        if (ifNamed == FALSE)
475
 
                sprintf(iter->current.name, "IPv6 %d",
476
 
                        iter->buf6->iAddressCount - iter->pos6);
 
479
                snprintf(iter->current.name, sizeof(iter->current.name),
 
480
                         "IPv6 %d",
 
481
                         iter->buf6->iAddressCount - iter->pos6);
477
482
 
478
483
        memset(iter->current.netmask.type.in6.s6_addr, 0xff,
479
484
               sizeof(iter->current.netmask.type.in6.s6_addr));