diff options
| author | Andreas Schwab <aschwab@redhat.com> | 2009-07-02 12:02:12 +0200 |
|---|---|---|
| committer | Andreas Schwab <aschwab@redhat.com> | 2009-07-02 12:02:12 +0200 |
| commit | 8c9533e18f842a79512d38b11662a1ed2355c6a8 (patch) | |
| tree | b34e8c0b58e27bba8a276ff76e5c846d53c20bf9 /nis | |
| parent | ffd515a6e7a265a63dd40037db66e80c1f243099 (diff) | |
| parent | 2fd0cd8b5257e7ae0c0df0651ee62a6ef7c37cc2 (diff) | |
| download | glibc-8c9533e18f842a79512d38b11662a1ed2355c6a8.tar.gz glibc-8c9533e18f842a79512d38b11662a1ed2355c6a8.tar.xz glibc-8c9533e18f842a79512d38b11662a1ed2355c6a8.zip | |
Merge commit 'origin/master' into fedora/master
Conflicts: ChangeLog
Diffstat (limited to 'nis')
| -rw-r--r-- | nis/nss_nis/nis-network.c | 2 | ||||
| -rw-r--r-- | nis/nss_nisplus/nisplus-network.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c index 9b02302e0b..22a898bb21 100644 --- a/nis/nss_nis/nis-network.c +++ b/nis/nss_nis/nis-network.c @@ -241,7 +241,7 @@ _nss_nis_getnetbyaddr_r (uint32_t addr, int type, struct netent *net, if (__builtin_expect (yp_get_default_domain (&domain), 0)) return NSS_STATUS_UNAVAIL; - struct in_addr in = inet_makeaddr (addr, 0); + struct in_addr in = { .s_addr = htonl (addr) }; char *buf = inet_ntoa (in); size_t blen = strlen (buf); diff --git a/nis/nss_nisplus/nisplus-network.c b/nis/nss_nisplus/nisplus-network.c index 1cf652f071..902826b62a 100644 --- a/nis/nss_nisplus/nisplus-network.c +++ b/nis/nss_nisplus/nisplus-network.c @@ -433,7 +433,7 @@ _nss_nisplus_getnetbyaddr_r (uint32_t addr, const int type, char buf2[18]; int olderr = errno; - struct in_addr in = inet_makeaddr (addr, 0); + struct in_addr in = { .s_addr = htonl (addr) }; strcpy (buf2, inet_ntoa (in)); size_t b2len = strlen (buf2); |