Received: by mail.netbsd.org (Postfix, from userid 605)
	id EA7AF84DB3; Wed, 26 May 2021 22:52:33 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 29DBD84DAF
	for <source-changes@NetBSD.org>; Wed, 26 May 2021 22:52:33 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id HCMxe226aaHI for <source-changes@netbsd.org>;
	Wed, 26 May 2021 22:52:32 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984])
	by mail.netbsd.org (Postfix) with ESMTP id A9B0484DA6
	for <source-changes@NetBSD.org>; Wed, 26 May 2021 22:52:32 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 92BC4FA95; Wed, 26 May 2021 22:52:32 +0000 (UTC)
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"
MIME-Version: 1.0
Date: Wed, 26 May 2021 18:52:32 -0400
From: "Christos Zoulas" <christos@netbsd.org>
Subject: CVS commit: src/external/mpl/dhcp/dist
To: source-changes@NetBSD.org
X-Mailer: log_accum
Message-Id: <20210526225232.92BC4FA95@cvs.NetBSD.org>
Sender: source-changes-owner@NetBSD.org
List-Id: <source-changes.NetBSD.org>
Precedence: bulk
Reply-To: source-changes-d@NetBSD.org
Mail-Reply-To: "Christos Zoulas" <christos@netbsd.org>
Mail-Followup-To: source-changes-d@NetBSD.org
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20source-changes&body=unsubscribe%20source-changes>

Module Name:	src
Committed By:	christos
Date:		Wed May 26 22:52:32 UTC 2021

Modified Files:
	src/external/mpl/dhcp/dist/client: dhclient.c
	src/external/mpl/dhcp/dist/common: parse.c
	src/external/mpl/dhcp/dist/common/tests: option_unittest.c
	src/external/mpl/dhcp/dist/relay: dhcrelay.c
	src/external/mpl/dhcp/dist/relay/tests: relay_unittests.c
	src/external/mpl/dhcp/dist/server: dhcpd.c

Log Message:
merge local changes between dhcp-4.4.2 and dhcp-4.4.2-P1


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/client/dhclient.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/common/parse.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/mpl/dhcp/dist/common/tests/option_unittest.c
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/dist/relay/dhcrelay.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/mpl/dhcp/dist/relay/tests/relay_unittests.c
cvs rdiff -u -r1.3 -r1.4 src/external/mpl/dhcp/dist/server/dhcpd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.