Date: Tue, 06 Mar 2007 23:55:31 +0000 From: "Bruce M. Simpson" <bms@FreeBSD.org> To: "Bruce M. Simpson" <bms@FreeBSD.org> Cc: FreeBSD Current <freebsd-current@freebsd.org>, Joerg.Pulz@frm2.tum.de, Scott Ullrich <sullrich@gmail.com> Subject: Re: Compiling ISC DHCP Server on current - ascii2addr() errors Message-ID: <45EDFF73.4070709@FreeBSD.org> In-Reply-To: <45EDFE78.4080702@FreeBSD.org> References: <d5992baf0703051421x2112cc8bl43786c0460ca9599@mail.gmail.com> <45EDFE78.4080702@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Bruce M. Simpson wrote:
>
> This patch should be good for all branches and should probably go
> upstream.
No, that's wrong. I am trying to do too many things at once and I just
got in from a night out.
See below.
>
> Regards,
> BMS
> ------------------------------------------------------------------------
>
> --- dhcpd.c.orig Tue Mar 6 23:45:25 2007
> +++ dhcpd.c Tue Mar 6 23:46:28 2007
> @@ -379,7 +379,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) == NULL)
> log_fatal ("invalid ip address: %s", argv[i]);
> jail_ip_address = ntohl (jail_ip_address);
> no_dhcpd_jail = 1;
> @@ -478,7 +478,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) == NULL)
> log_fatal ("invalid ip address: %s", s2);
> jail_ip_address = ntohl (jail_ip_address);
> }
>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?45EDFF73.4070709>