From nobody Sat Sep 12 16:40:00 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hhxwP1hJYz6sQHs for ; Sat, 12 Sep 2026 16:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hhxwP18kWz4bqQ for ; Sat, 12 Sep 2026 16:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789231205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e7KZc4UY6Upr/gaIEC3K1jinLPCPD5H0POGa0KKJzDg=; b=LqSjuX6dTp4Qr4fdvKSkZ6Iz3tKS55zqSddi+fDIaVyFYP4UCJkoB96t/JAJwwMpmF1iyU 65SN3a0cE3rVCqYCVELELcxrgwbUlmymHJ7VtFOm9ZQI168kbrrfcgHFWPQdhYesGrTRPi 0Rx8BUUUZ+Q6wZFx1VOpvNM2B2od/wVVyKyOql4kX7s91OHHsthg5/GkHLrXnBndCQv/zm FNNHO08Ucsu7e5HHuoZLvOYWk63YrOvNmdBtsvlRycWf3tVyCaMcptpIJ0fqKU0do066pL v8zV+Q1yrwGD+jNwVSlLK7TzIjlp5fLpEZnmK9tIHp89hRh+l+nLhxV7iDBZWA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789231205; b=xBksNI4d3Kv8AM7h/YfVAyBiFhXvYK0BoJ+L6NsRjfraQhIfjF+GEz6aXhJOD3ZsRdVi50 wm/HhE9rPGyz/aD+NUyxa0HM9AUF68nHFDjLVbNQHl5B0HtEAkSDj/gVMX/1Ko5FBcqYQr awuOlHpWXBSHoJjZitr4OuZjtWyzh3h42GnGQWpLCLmXinhVg6c4OTxT+dSpVOAHZEY+zG ZXtrg1Z8G2uwk5aoghkkWyhlTVZwxdk+2Q2Vahuw0+TETgn5mmRThXKjGZBXnx+QoIfAhs eUZ4pKm+T5B9yr0ojymkdQPkhkSXIj+J06aVuqG7mdCvaMD8EtD4CkITW1P+Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789231205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e7KZc4UY6Upr/gaIEC3K1jinLPCPD5H0POGa0KKJzDg=; b=HpuGeoTJ7m7+YKcL7MqSj1VV3Q+1DLTxutHJ5OBxB43mAOhWC/QNdlCq39i4/TWYgFk+Ou sPYQlBQfbDHxrW91C9qL8AxfiB6zBpEbXwxFi17jkMxz+kpDv09K6rfj7Sa8fQR0W2N717 KVCaqA8wR1XX9wjcHoYDfUP5M9trh8xbsStRYW/VwsyoMdgZZBwHYcfl7gRDE+dmb0gzKN o+5pskfV0MFElqNM5Sr68zKmSF0wWzYT239jDtcs8sRtFMwfPX9CEc1cEguxWXUj0tluMy ki80Fimc3g09HQa98xT9sgybIKAA0+0xXIgVFAQNlGe3ODmUqGiJSPbD7cn1Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hhxwP0F9bz15kg for ; Sat, 12 Sep 2026 16:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c95f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 12 Sep 2026 16:40:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: b485d70d4eb2 - main - dhclient(8): Fix dhcpack comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b485d70d4eb233dc0c6a7efbc6c1f42ebc353c50 Auto-Submitted: auto-generated Date: Sat, 12 Sep 2026 16:40:00 +0000 Message-Id: <6aa58060.3c95f.588a36f2@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=b485d70d4eb233dc0c6a7efbc6c1f42ebc353c50 commit b485d70d4eb233dc0c6a7efbc6c1f42ebc353c50 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-09-12 16:32:57 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-09-12 16:37:39 +0000 dhclient(8): Fix dhcpack comment Restore a comment accidentally removed above dhcpack. Fixes: 37fd3fcaaf0e ("dhclient(8): Add support for IPv6-Only option (RFC 8925)") --- sbin/dhclient/dhclient.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 88963aa93bf4..e06517a06733 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -783,7 +783,6 @@ freeit: } /* - * state_requesting is called when we receive a DHCPACK message after * RFC 8925, sec 3.2: if the packet carries a valid IPv6-Only Preferred * option and we have IPv6 connectivity, stop DHCPv4 for V6ONLY_WAIT * seconds or until a network attachment event, whichever comes first. @@ -851,6 +850,8 @@ v6only_wait_expired(void *ipp) state_reboot(ip); } +/* state_requesting is called when we receive a DHCPACK message after + having sent out one or more DHCPREQUEST packets. */ void dhcpack(struct packet *packet) {