diff options
| author | joerg <joerg@pkgsrc.org> | 2015-11-30 22:38:16 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-11-30 22:38:16 +0000 |
| commit | 751499b9584e777d3dfb6be0cc4b07e48eb70c6d (patch) | |
| tree | 2e4d4b8643ffa41daec10ea301c3aa88a1dc96f5 | |
| parent | cd01d9bb6b80937db9f2f98bfe47a3b14c133114 (diff) | |
| download | pkgsrc-751499b9584e777d3dfb6be0cc4b07e48eb70c6d.tar.gz | |
Revert. Committer was explicitly asked to not commit that change as it
is incompletely and incorrect.
| -rw-r--r-- | pkgtools/pbulk-base/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pbulk/files/pbulk/lib/netaddr.c | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/pkgtools/pbulk-base/Makefile b/pkgtools/pbulk-base/Makefile index a521aa60ac7..8aadcd2a91e 100644 --- a/pkgtools/pbulk-base/Makefile +++ b/pkgtools/pbulk-base/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2015/11/30 20:46:57 asau Exp $ +# $NetBSD: Makefile,v 1.19 2015/11/30 22:38:16 joerg Exp $ -DISTNAME= pbulk-base-0.51 +DISTNAME= pbulk-base-0.50 COMMENT= Core components of the modular bulk build framework .include "../../pkgtools/pbulk/Makefile.common" diff --git a/pkgtools/pbulk/files/pbulk/lib/netaddr.c b/pkgtools/pbulk/files/pbulk/lib/netaddr.c index 4d6fe29929a..c95385c6520 100644 --- a/pkgtools/pbulk/files/pbulk/lib/netaddr.c +++ b/pkgtools/pbulk/files/pbulk/lib/netaddr.c @@ -1,4 +1,4 @@ -/* $NetBSD: netaddr.c,v 1.9 2015/11/30 20:46:57 asau Exp $ */ +/* $NetBSD: netaddr.c,v 1.10 2015/11/30 22:38:16 joerg Exp $ */ /*- * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -37,7 +37,6 @@ #include <arpa/inet.h> #include <errno.h> #include <netinet/in.h> -#include <netdb.h> #include <nbcompat/stdlib.h> #include <nbcompat/string.h> @@ -53,12 +52,9 @@ parse_sockaddr_in(const char *str, struct sockaddr_in *addr) if ((port_sep = strrchr(str, ':')) != NULL) { char *addr_part = strdup(str); - struct hostent *he; addr_part[port_sep - str] = '\0'; - if ((he = gethostbyname(addr_part)) != NULL) { - memmove(&in, he->h_addr, sizeof(in)); - } else if (inet_aton(addr_part, &in) == 0) { + if (inet_aton(addr_part, &in) == 0) { free(addr_part); return -1; } |