From nobody Fri Aug 8 17:45:04 2025 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 4bzBJ11sphz64GmF; Fri, 08 Aug 2025 17:45: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bzBJ028x9z4G5H; Fri, 08 Aug 2025 17:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754675104; 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=G2g9+pIpXg8ORwUc/3OFVO5N76OR/oMuwY68tgTK4Yk=; b=hKbm8GDF6gHGX3cbFttmbCU9yrUOod7EhyIlOLG29Sb6p1T3tJJNxgKbf+M/PuX5nTjVDy Pxl/RGiehtkF2sXhVM8dm7Kaq8+yGilqAOzvfZ74Tu1F2DDz6H839RfumN/Hiezy5JU9DO vjR9mXx9JVvrYhgu31Z6aaoSkk4IQdyn23Ya+BJnCdEDGJzuYHmLDIWE5u7EFYGtGGalyG UioKRV6ahHtjsc+8Cy5LhypafhUC5qW7JO12WB5LrmjtAY+o/IpQJGfdALK3llbMHt8wBk nd8+wOXQVLX34xBt8XovaBQ9DxlEbbr3dzsSGGRhx9ZDAS15aaVmacWiuCqrlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754675104; 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=G2g9+pIpXg8ORwUc/3OFVO5N76OR/oMuwY68tgTK4Yk=; b=AnDvqsJIFfTd39rI5k/Hjlv7Yom8agrv6aKSjdc3GO681F5NNV0Zuf6jcUEqmDCsOVugqt dwI2lAcL8iiow0EZFehAfCMWt5R2R+lfYjPn4zLSfoBjWJVCcAnwUAfweu9hJjBhmxDH3b HehWM0ZKQpGjhd9ij3xc3mAD8L0LrLZdrB0PuPAmhl+6UHmdfizVM6lm54PCAs37f5R8yc BRmQQ5kwO93gti0eVKspG12vA2gjzP9Be/6CQtYZ/VFSIPji8vL1Osq4LAg9VFW8BW3o6+ sLvl9DSkyzI9x6ZHfe0FoAy7hWC0dc/msH/ydb05Hdafy6acXh6ZqkXrd7pY0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754675104; a=rsa-sha256; cv=none; b=dS8XCnfZuESixAUC2lyzCm3LOUbzvZmsRnlvMvRk+8AcNQSmQ1IVKIheWemCEazQ+shWmj n6wZVVGU67pXcKfWHc5rotLSmSdomP43X7LsfSMQ/f1fKSO6IhWlCegonEWSbsdM1pcnkE wEklRBDgbCdsDKIoQf/FHm3BgnN+oVhy3doIsM6GlfmfACxNtnrhGefJovyMxQlq5fky03 KRzkAVjYJMIOJfFrESeN+uYGaiVg1GrzNV1qemR4VOlSJbt/6RbopJ3b2ydTjyzHS/m5rV 2l3TMSMJR4hvwo/pUnaajRyajnr1TeH1GBYgiu0suG4fCE/8mhS8Y0P1ILHKJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bzBJ00z6xzmLX; Fri, 08 Aug 2025 17:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 578Hj4m9000557; Fri, 8 Aug 2025 17:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 578Hj4sv000554; Fri, 8 Aug 2025 17:45:04 GMT (envelope-from git) Date: Fri, 8 Aug 2025 17:45:04 GMT Message-Id: <202508081745.578Hj4sv000554@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7de6d9d9b6bd - main - openssh: Include explicitly in includes.h 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7de6d9d9b6bd8b1cd5e190cf4f12df498b34a646 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7de6d9d9b6bd8b1cd5e190cf4f12df498b34a646 commit 7de6d9d9b6bd8b1cd5e190cf4f12df498b34a646 Author: John Baldwin AuthorDate: 2025-08-08 17:43:36 +0000 Commit: John Baldwin CommitDate: 2025-08-08 17:43:36 +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 --- crypto/openssh/includes.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crypto/openssh/includes.h b/crypto/openssh/includes.h index 6d17ef6da933..c3cd8b40e0b9 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