From nobody Fri Jul 10 03:20:06 2026 X-Original-To: dev-commits-src-main@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 4gxHBv1PmPz6kMVN for ; Fri, 10 Jul 2026 03:20:07 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gxHBv0nNSz3VkC for ; Fri, 10 Jul 2026 03:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783653607; 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=iYA3mLMDgggST4wuh+tdo+VBwV8HUjiNl3Wp0Kq/vmM=; b=OycqMnsNEHUWM83aVljnjpZ4VQwGX/1/DNhcYaXQotjmY9IpSLzPCpSAGQPydZr+Zh+EFD gxBoSSwGvTFgEZ7nqssyOHxVIP8za+Ym0ws8bueroITojqubRA/WAY2/hw+wWGJKBQZlms 9iADfpuBVoxlS+Recogz5LxxBUz9SSz+a7n+XmcC4n3YQsZrfQUTyRhYgUI8/QevfSArgZ LgK2aebwOJrokfJymcqCyWLxcAPn8sIu5xw0d4gSQMWwUhrH/eANapLhWubi8VvfiNJqO4 RO2HanUlERXkrwN4xRTsiFq+EEerv49PQZ6Q4LaYZuURX5QmYzkO50fDO6+NKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783653607; a=rsa-sha256; cv=none; b=sDsPMWnvJG8aBGashDmdp4WR2cO/S93txtvVkRuaTe+H3SYQROp73aM9iaP6VystFwf8Ee FjEej5PoIPYiGm5RKrBBWHC7fhKk/Lc3D7YuVuMpZHL6HMf3u84rVZ/jfOtUBZqi4Pwf4l rKePduSUYiNPt+kmGpFhqXcIPphPuJqrl9+jKh5djDRHB0cIA8BxwhZJLu+diRZxN01pJv 3K1pUcTMgewr2RhWty9vRCNlpWlGI9lUXSqYbdhrrhc3i0luPWycthRJKFT4ZvYjOgVGUM uyWw5r1p/CJUuH31yqloukXWHLf0wO04anyB+angiNQmIfY3Qk1rE5X9q44nCg== 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=1783653607; 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=iYA3mLMDgggST4wuh+tdo+VBwV8HUjiNl3Wp0Kq/vmM=; b=st8j0vRRhScNIcUSuygVvBNReopTqkHIQoAnPrq0pUEOiEVO6Ogl76f0CVekUlSbRitb7X 6Fi9aoS12wJqu6tfB94e5Iax4+Q2v+Z722Z/yn+J7yGw8LnPS0as3iW7/0Y+fRLfgScG1b jJfZDbBTz3YmV9PWAY9jwiPiZy3ZPBnSvccBTvkzeG+gsV09WXOdTgbb8ZMqtEN5/IePxa P9DOVcyDMEJYz9VSYlfvzNyLqg4CbfnSU2ZieATYNMznAuIjXwlM1bO+JFgzf0F9fV5q6R OGX+ODkgYQ+4wkccfXGd0UyGsD9+8SEBIzVVy58UjguVIrEPwuyPPWtVvyFEoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gxHBt6S3NzdWk for ; Fri, 10 Jul 2026 03:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 10 Jul 2026 03:20:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 5792a639ab95 - main - openssh: fix GSSAPI option names List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5792a639ab950fb7e6add09352e1cd41f1809bc2 Auto-Submitted: auto-generated Date: Fri, 10 Jul 2026 03:20:06 +0000 Message-Id: <6a5064e6.26a1d.19f7c526@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5792a639ab950fb7e6add09352e1cd41f1809bc2 commit 5792a639ab950fb7e6add09352e1cd41f1809bc2 Author: Ed Maste AuthorDate: 2026-07-10 03:15:37 +0000 Commit: Ed Maste CommitDate: 2026-07-10 03:15:37 +0000 openssh: fix GSSAPI option names From openssh-portable commit c14709356563. Reported by: cy --- crypto/openssh/servconf.c | 18 +++++++++--------- crypto/openssh/servconf.h | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 7ed4dd2353fa..db8aab5f8fc1 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.450 2026/06/29 08:59:31 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.451 2026/07/07 01:00:22 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved @@ -1441,19 +1441,19 @@ process_server_config_line_depth(ServerOptions *options, char *line, #endif /* KRB5 */ #ifdef GSSAPI - case sGssAuthentication: + case sGSSAPIAuthentication: intptr = &options->gss_authentication; goto parse_flag; - case sGssCleanupCreds: + case sGSSAPICleanupCredentials: intptr = &options->gss_cleanup_creds; goto parse_flag; - case sGssDelegateCreds: + case sGSSAPIDelegateCredentials: intptr = &options->gss_deleg_creds; goto parse_flag; - case sGssStrictAcceptor: + case sGSSAPIStrictAcceptorCheck: intptr = &options->gss_strict_acceptor; goto parse_flag; #endif /* GSSAPI */ @@ -4227,10 +4227,10 @@ dump_config(ServerOptions *o) # endif #endif #ifdef GSSAPI - dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); - dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); - dump_cfg_fmtint(sGssDelegateCreds, o->gss_deleg_creds); - dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor); + dump_cfg_fmtint(sGSSAPIAuthentication, o->gss_authentication); + dump_cfg_fmtint(sGSSAPICleanupCredentials, o->gss_cleanup_creds); + dump_cfg_fmtint(sGSSAPIDelegateCredentials, o->gss_deleg_creds); + dump_cfg_fmtint(sGSSAPIStrictAcceptorCheck, o->gss_strict_acceptor); #endif dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication); dump_cfg_fmtint(sKbdInteractiveAuthentication, diff --git a/crypto/openssh/servconf.h b/crypto/openssh/servconf.h index 031032181889..27cabdb070bb 100644 --- a/crypto/openssh/servconf.h +++ b/crypto/openssh/servconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.177 2026/05/31 11:30:50 djm Exp $ */ +/* $OpenBSD: servconf.h,v 1.179 2026/07/07 01:00:22 djm Exp $ */ /* * Author: Tatu Ylonen @@ -316,16 +316,16 @@ SSHCONF_UNSUPPORTED_INT(kerberos_get_afs_token, KerberosGetAFSToken, SSHCFG_GLOB #ifdef GSSAPI #define SSHD_CONFIG_ENTRIES_GSS \ -SSHCONF_INTFLAG(gss_authentication, GssAuthentication, SSHCFG_ALL, 0, SSHCFG_COPY_MATCH) \ -SSHCONF_INTFLAG(gss_cleanup_creds, GssCleanupCreds, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \ -SSHCONF_INTFLAG(gss_deleg_creds, GssDelegateCreds, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \ -SSHCONF_INTFLAG(gss_strict_acceptor, GssStrictAcceptor, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) +SSHCONF_INTFLAG(gss_authentication, GSSAPIAuthentication, SSHCFG_ALL, 0, SSHCFG_COPY_MATCH) \ +SSHCONF_INTFLAG(gss_cleanup_creds, GSSAPICleanupCredentials, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \ +SSHCONF_INTFLAG(gss_deleg_creds, GSSAPIDelegateCredentials, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) \ +SSHCONF_INTFLAG(gss_strict_acceptor, GSSAPIStrictAcceptorCheck, SSHCFG_GLOBAL, 1, SSHCFG_COPY_NONE) #else /* GSSAPI */ #define SSHD_CONFIG_ENTRIES_GSS \ -SSHCONF_UNSUPPORTED_INT(gss_authentication, GssAuthentication, SSHCFG_ALL) \ -SSHCONF_UNSUPPORTED_INT(gss_cleanup_creds, GssCleanupCreds, SSHCFG_GLOBAL) \ -SSHCONF_UNSUPPORTED_INT(gss_deleg_creds, GssDelegateCreds, SSHCFG_GLOBAL) \ -SSHCONF_UNSUPPORTED_INT(gss_strict_acceptor, GssStrictAcceptor, SSHCFG_GLOBAL) +SSHCONF_UNSUPPORTED_INT(gss_authentication, GSSAPIAuthentication, SSHCFG_ALL) \ +SSHCONF_UNSUPPORTED_INT(gss_cleanup_creds, GSSAPICleanupCredentials, SSHCFG_GLOBAL) \ +SSHCONF_UNSUPPORTED_INT(gss_deleg_creds, GSSAPIDelegateCredentials, SSHCFG_GLOBAL) \ +SSHCONF_UNSUPPORTED_INT(gss_strict_acceptor, GSSAPIStrictAcceptorCheck, SSHCFG_GLOBAL) #endif /* GSSAPI */ #define SSHD_CONFIG_ENTRIES \