From nobody Thu Feb 12 05:07:30 2026 X-Original-To: dev-commits-src-branches@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 4fBNb63xhBz6SJF3 for ; Thu, 12 Feb 2026 05:07:30 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBNb61d5Nz3Pgh for ; Thu, 12 Feb 2026 05:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770872850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h5HeAt4uN7SvWAkK7fED3axnGfl24aXF/ZvcMuQM/J8=; b=r7soEhLXIN+zvKy9W2jc8pHltRiS8t9fc1ku/SDD5KOQIw5OPZYIRTmNGAPXv/yKJsiuTS zs8EQciO4BGmuBPD6v3DTf5qJ9jqp4BH9K2GZg6JERVTDkBrqriglkm3uskV8DYxrRHpm2 ILkLzUFilCjKnnFbMs5hAToOLH2yGv1e37/xRczcoheww2J2XBR8TUw4M7xka55zTH4xpY tpLnYtw+UYicHkFGB75UqUboO6TNUI0nskw113aBrc8tvPei9yqz1itI9mgpZS+Gxn1Qsg 8Z8nhaC69fO+rkTIZ2v+M1468mIihgAr4alWXSNSNRrhVFE8Y8TRf7yqfOk8ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770872850; a=rsa-sha256; cv=none; b=UI9Nz214XVHoFh8lcEqmOSSvHgrWxkbNZiB1/p9FpHYIy9l5mJ720v3M4RmTI5pt0XNHF7 /sJUAE3FB6jkBkhD19yEM5E9ALAYh2TjXbbha2T7dKEXv0A/RafK7ceCy97k8UxMUSYtVD 49GpjQ9cftCIbmR/GYUdB1n73XVRbRfzSUarrGLVttuWqBBzKDS5rNl3xJay10EtQHgHDS mBhojSH0yZiu4NrsmyoFMN6JOPLhXATwFu4j6dhlaiaMqPkn6324+QdPzWmx7+X++djbG9 TNmOsmfMt/JCWJMXxdiT4ZvIUgCTywyAL0ZjjLoTcm8vXY6Pu9wHdYQa/CuuXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770872850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h5HeAt4uN7SvWAkK7fED3axnGfl24aXF/ZvcMuQM/J8=; b=W1bWZ3PZmvifVKW32JhLPlrgO1oMPx/VQGcFSiV87yNXFseApasc5G05BptCsMLJl0vZgK gPxX7M7rHizGM0PrdbOyAwNvl3q6Q/Buas97Zmx9PCrLvm5O9TSA2yChakP8zsAxoyFpko Mrs4SY9ZOpb3H6yUDEWNLtjTV2kX/fXn/zRGZYIkKRB0wOLtKT33eDrfGgOLz1zTYHLjGW G1GdHoc+c+i+1d49pTbzgZQZqAXxLDwxa9l9jGXJwsHU7QoceSLFKO2s9sqdwZxMMVCG75 NZpWi8m/HO+rGk3O1an0hWW928+M6JSamdajzbrJmvFZ0XUl3kxEo2tOzSCs6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBNb615Qvz6L9 for ; Thu, 12 Feb 2026 05:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24d46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 05:07:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Felix Johnson From: Alexander Ziaee Subject: git: 867ef0cf9e02 - stable/15 - wpa_supplicant.conf.5: Remove removed variables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 867ef0cf9e02b1e11be3f1a9b6f0b9d266f9fae0 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 05:07:30 +0000 Message-Id: <698d6012.24d46.2bb50092@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=867ef0cf9e02b1e11be3f1a9b6f0b9d266f9fae0 commit 867ef0cf9e02b1e11be3f1a9b6f0b9d266f9fae0 Author: Felix Johnson AuthorDate: 2026-02-05 15:46:49 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-12 05:04:43 +0000 wpa_supplicant.conf.5: Remove removed variables 2005-09-25 - wpa_supplicant v0.4.5 removed "server_nai" 2008-02-22 - wpa_supplicant v0.6.3 removed "eappsk" and "nai" PR: 284126 MFC after: 3 days Reviewed by: carlavilla, ziaee Reported by: J.R. Oldroyd Differential Revision: https://reviews.freebsd.org/D49010 (cherry picked from commit c5ee920c3f35c5f0f485a7a274d87ebd91469892) --- usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 index 852d83f463ce..59dc8be6a99d 100644 --- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 +++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 @@ -405,12 +405,6 @@ but for EAP inner Phase 2. Like .Va subject_match but for EAP inner Phase 2. -.It Va eappsk -16-byte pre-shared key in hex format for use with EAP-PSK. -.It Va nai -User NAI for use with EAP-PSK. -.It Va server_nai -Authentication Server NAI for use with EAP-PSK. .It Va pac_file Pathname to the file to use for PAC entries with EAP-FAST. The