From nobody Tue Jan 20 19:43:37 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 4dwd6f1VLLz6P3Cs for ; Tue, 20 Jan 2026 19:43:38 +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 4dwd6d5mFKz3t39 for ; Tue, 20 Jan 2026 19:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938217; 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=yBAP/kQZgmSh/yUaS7qqkV+hc4S7ZJeEk+6xxNYFd+E=; b=hqwD/QKQ9FZIFr38LdBh0YKzEtFDGXy9mXEf6bvorxv6GaIMoz+4ZU739qw5cu4TerJbki smkxssqPwUOSJ5v561gEAnYRFSteP+63fKS5wXULkNysJR8xJ7eZo5A/rCUUJRY3LQWbPs q+xcFBXz3SznD+srJX8vKc1xa7QjUXkB2y6vwc6+kLDTJdiTmA3nPc7mgtZ6VY86uOCnZc Uzv5Lu4ixlkEFdB0eUs7+Kisxo7yxlZOY+Mn1/tGn7oMTdkYSFQPqwZqaxuwNzl4rnjfUq xenQFhT6uY2XYW6iX+T+7bubndxUV3PIpVhHn4+bCT0SqgG2VDacE5Qw+CoG2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768938217; 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=yBAP/kQZgmSh/yUaS7qqkV+hc4S7ZJeEk+6xxNYFd+E=; b=S2I1+GmLG5QSUVLGOIq+nSMZDKQf3QZBdH9Blprc0o+QBYlOL9cxievo8l2PQUiuZCgAA+ 2qHFv91U295vk875rs4P75eqrH5t7gpqtLCgOtZMXyueCK0xbWaKl4O4zYSP2yjLT41tj4 ebVIMvz0+1ibAFJ8bQ2fZnCdkh21segLy7GaKZVyG78YHNJvWJwSNb0CWs1zNBGiqt9/pH YLh4bPN2Fxylcc79t45vWxtRIfb0BmgnHFjNcftGnMHW8KTvMSV9ggOMqdf88mOSj9zmga doCUwIIS4F7trOxwbs/vQCPJXXSOCI46lLoCEhmVBs2CG8bSZ5zcYpHotJxbUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768938217; a=rsa-sha256; cv=none; b=T4BxS0j7MGj1sYqjdQBhISrtSXh4AIaJKX4djaheczwAAndKzhlWJl3q6cX92LsRgztaSz 8ajo+ezucx+Ts7jB3IG7HfZxSsKZQdcal/nu8wrDZhWBDAjeKCfeCM8pXyoho18aq+bhLP fNqBmxCt0l8t8VDEnl/NNI0nZ3D0x/QEBQOIfYYqtU8Ysk1bpLcL0To4JxzgxJyx0t6YQ4 cwRezjkOYKq0ReZMXYrK42Kr7Zs2e4RzEyGH3eEIkpPfUgOAENB0fLjACfouoISWxMgcj5 ksu3fUXx5Z6ue9Uogc+gd2kTU2KmNafK+gFSAcKAzNlOp1LHTEIvnUR0IutJiA== 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 4dwd6d4BZCzts for ; Tue, 20 Jan 2026 19:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d509 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 19:43:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: John Baldwin From: Ed Maste Subject: git: b19f74cfc43b - stable/14 - openssh: Include explicitly in includes.h 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b19f74cfc43b2b555875fa8be35ae23cab6e6096 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 19:43:37 +0000 Message-Id: <696fdae9.d509.802d206@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b19f74cfc43b2b555875fa8be35ae23cab6e6096 commit b19f74cfc43b2b555875fa8be35ae23cab6e6096 Author: John Baldwin AuthorDate: 2025-08-08 17:43:36 +0000 Commit: Ed Maste CommitDate: 2026-01-20 19:42:08 +0000 openssh: Include explicitly in includes.h This was previously included due to nested includes in Heimdal's headers. Without this, the build fails with an error due to redefining AT_FDCWD. clang: In file included from crypto/openssh/sshd-session.c:46: /usr/obj/.../tmp/usr/include/fcntl.h:232:9: error: 'AT_FDCWD' macro redefined [-Werror,-Wmacro-redefined] 232 | #define AT_FDCWD -100 | ^ crypto/openssh/openbsd-compat/bsd-misc.h:69:10: note: previous definition is here 69 | # define AT_FDCWD (-2) | ^ GCC (can't be disabled): In file included from crypto/openssh/sshd-session.c:46: sys/sys/fcntl.h:232:9: error: "AT_FDCWD" redefined [-Werror] 232 | #define AT_FDCWD -100 | ^~~~~~~~ In file included from crypto/openssh/openbsd-compat/openbsd-compat.h:218, from crypto/openssh/includes.h:173, from crypto/openssh/sshd-session.c:30: openssh/openbsd-compat/bsd-misc.h:69:10: note: this is the location of the previous definition 69 | # define AT_FDCWD (-2) | ^~~~~~~~ Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51809 (cherry picked from commit 7de6d9d9b6bd8b1cd5e190cf4f12df498b34a646) --- crypto/openssh/includes.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h index 8f933568d337..96cddbc26089 100644 --- a/crypto/openssh/includes.h +++ b/crypto/openssh/includes.h @@ -34,6 +34,9 @@ #ifdef HAVE_ENDIAN_H # include #endif +#ifdef HAVE_FCNTL_H +# include +#endif #ifdef HAVE_TTYENT_H # include #endif