← Back to branch summary

~ubuntu-branches/ubuntu/wily/net-snmp/wily-proposed

« back to all changes in this revision

Viewing changes to snmplib/inet_ntop.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-28 14:59:36 UTC
  • mfrom: (1.2.3 upstream) (1.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100628145936-cbiallic69pn044g
Tags: 5.4.3~dfsg-1ubuntu1
https://launchpad.net/bugs/104738
https://launchpad.net/bugs/254261
https://launchpad.net/bugs/250459
https://launchpad.net/bugs/589056
https://launchpad.net/bugs/573391
https://launchpad.net/bugs/533603
* Merge from debian unstable.  Remaining changes:
  - Set Ubuntu maintainer address.
  - net-snmp-config: Use bash. (LP: #104738)
  - Removed multiuser option when calling update-rc.d. (LP: #254261)
  - debian/snmpd.init: LSBify the init script.
  - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcmd.1
    (LP: #250459)
  - debian/snmpd.postinst: source debconf before doing work, LP: #589056
  - debian/snmp.preinst, debian/snmp.prerm: kill any/all processes owned by
    snmp user before install/uninstall, LP: #573391
  - Add apport hook (LP: #533603):
  - debian/{snmp,snmpd}.apport: Added.
  - debian/control: Build-depends on dh-apport.
  - debian/rules: 
    + Add --with apport.
    + override_dh_apport to install hook on snmpd package only.
 * Dropped patches:
   - debian/patches/99-fix-ubuntu-div0.patch: Fix dvision by zero.. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
snmplib/inet_ntop.c
25
25
#include <arpa/nameser.h>
26
26
#endif
27
27
 
28
 
  /*
29
 
   * Net-SNMP Win32 additions
30
 
   */
31
 
#if defined(HAVE_WINSOCK_H) || defined(cygwin)
 
28
#if defined(HAVE_WINSOCK_H)
32
29
#include <winsock2.h>
33
30
#include <ws2tcpip.h>
 
31
#endif
34
32
#include <errno.h>
35
33
#include <stdio.h>
 
34
#if HAVE_STRING_H
 
35
#include <string.h>
 
36
#else
 
37
#include <strings.h>
36
38
#endif
37
39
 
 
40
#include <net-snmp/types.h>
 
41
 
38
42
#ifndef EAFNOSUPPORT
39
43
#define EAFNOSUPPORT            WSAEAFNOSUPPORT
40
44
#endif
41
 
  /*
42
 
   * End of Net-SNMP Win32 additions
43
 
   */
44
45
 
45
46
#ifndef IN6ADDRSZ
46
47
#define IN6ADDRSZ       16