diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2007-03-14 17:14:06 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-03-14 17:14:06 +0000 |
commit | 01bd80af4aae0d212d3dc1ed551a5eda51e6e2d8 (patch) | |
tree | 6d3d25be91b14b13173e9a2191cb0209148419b1 /net/isc-dhcp3-server | |
parent | - Update to 3.3.1 (diff) |
- Fix build on recent current after ascii2addr() removal
PR: ports/110028
Submitted by: Joerg Pulz <Joerg.Pulz@frm2.tum.de> (maintainer)
Obtained from: bms
Diffstat (limited to 'net/isc-dhcp3-server')
-rw-r--r-- | net/isc-dhcp3-server/Makefile | 2 | ||||
-rw-r--r-- | net/isc-dhcp3-server/files/patch-server::dhcpd.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile index 03a8b81e3a7a..ea88ac706d0f 100644 --- a/net/isc-dhcp3-server/Makefile +++ b/net/isc-dhcp3-server/Makefile @@ -19,7 +19,7 @@ DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL} MAINTAINER= Joerg.Pulz@frm2.tum.de COMMENT?= The ISC Dynamic Host Configuration Protocol server -PORTREVISION_SERVER= 1 +PORTREVISION_SERVER= 2 PORTREVISION_CLIENT= 0 PORTREVISION_RELAY= 0 PORTREVISION_DEVEL= 0 diff --git a/net/isc-dhcp3-server/files/patch-server::dhcpd.c b/net/isc-dhcp3-server/files/patch-server::dhcpd.c index e2e6e24e814e..c45ed9214792 100644 --- a/net/isc-dhcp3-server/files/patch-server::dhcpd.c +++ b/net/isc-dhcp3-server/files/patch-server::dhcpd.c @@ -117,7 +117,7 @@ + set_jail = argv [i]; + if (++i == argc) + usage (); -+ if (ascii2addr (AF_INET, argv[i], &jail_ip_address) < 0) ++ if (inet_pton (AF_INET, argv[i], &jail_ip_address) < 0) + log_fatal ("invalid ip address: %s", argv[i]); + jail_ip_address = ntohl (jail_ip_address); + no_dhcpd_jail = 1; @@ -146,7 +146,7 @@ + if (!no_dhcpd_jail && (s = getenv ("DHCPD_JAIL_HOSTNAME")) && + (s2 = getenv ("DHCPD_JAIL_IPADDRESS"))) { + set_jail = s; -+ if (ascii2addr (AF_INET, s2, &jail_ip_address) < 0) ++ if (inet_pton (AF_INET, s2, &jail_ip_address) < 0) + log_fatal ("invalid ip address: %s", s2); + jail_ip_address = ntohl (jail_ip_address); + } |