From owner-freebsd-current@FreeBSD.ORG  Tue Mar  6 23:57:23 2007
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@freebsd.org
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1284316A400;
	Tue,  6 Mar 2007 23:57:23 +0000 (UTC) (envelope-from bms@FreeBSD.org)
Received: from out5.smtp.messagingengine.com (out5.smtp.messagingengine.com
	[66.111.4.29])
	by mx1.freebsd.org (Postfix) with ESMTP id DD97B13C4A3;
	Tue,  6 Mar 2007 23:57:22 +0000 (UTC) (envelope-from bms@FreeBSD.org)
Received: from out1.internal (unknown [10.202.2.149])
	by out1.messagingengine.com (Postfix) with ESMTP id 71F641F5E64;
	Tue,  6 Mar 2007 18:57:22 -0500 (EST)
Received: from heartbeat2.messagingengine.com ([10.202.2.161])
	by out1.internal (MEProxy); Tue, 06 Mar 2007 18:57:22 -0500
X-Sasl-enc: DHlc/SyyTonxtEU2c8TiMYq0oavm47mU5uI1nUtmVQwF 1173225442
Received: from [192.168.123.18]
	(82-35-112-254.cable.ubr07.dals.blueyonder.co.uk [82.35.112.254])
	by mail.messagingengine.com (Postfix) with ESMTP id CEA63B9A2;
	Tue,  6 Mar 2007 18:57:21 -0500 (EST)
Message-ID: <45EDFFE0.4020203@FreeBSD.org>
Date: Tue, 06 Mar 2007 23:57:20 +0000
From: "Bruce M. Simpson" <bms@FreeBSD.org>
User-Agent: Thunderbird 1.5.0.9 (X11/20070125)
MIME-Version: 1.0
To: "Bruce M. Simpson" <bms@FreeBSD.org>
References: <d5992baf0703051421x2112cc8bl43786c0460ca9599@mail.gmail.com>
	<45EDFE78.4080702@FreeBSD.org> <45EDFF73.4070709@FreeBSD.org>
In-Reply-To: <45EDFF73.4070709@FreeBSD.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Mar 2007 23:57:23 -0000

Bruce M. Simpson wrote:
> No, that's wrong. I am trying to do too many things at once and I just 
> got in from a night out.
>
I will re-read patches before sending them.
I will re-read patches before sending them.
I will re-read patches before sending them.
I will re-read patches before sending them.
I will change my name to Bart by deed-poll.
> 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) != 1)
>>                  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) != 1)
>>              log_fatal ("invalid ip address: %s", s2);
>>          jail_ip_address = ntohl (jail_ip_address);
>>      }
>>   
>