From nobody Sun Aug 04 10:24:07 2024 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 4WcFzW6gJcz5SY4V; Sun, 04 Aug 2024 10:24: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WcFzW6Cdgz4Djq; Sun, 4 Aug 2024 10:24:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722767047; 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=hNHrXTxTEmdoqwNjPkN0zaiIrD9oAxL8FXz/f5HNWy4=; b=pWDtdFRoBij1BVvFID9t5cUASLgsMuRxoz7whABQZ5BQnMyntemsj0f+sN7ouilfzfsgEh jR2HpKbuGHxjJqN8jDUFLi+dyv4427wSuUYlCmSa0Ja+QbeA3Fx9F3cyrxrb0SGGYhIWsG tzZm37VHoKZ38hAC1uqrUcxpSUchhpvxmuij+/4tXjkNGPpqoui4+AHslCSwBn5TRaX/bB nwvzqmbRKXPohZD+SUvIms5UZuU5NUkLogPRWz/E9agnBrbAuRult8ZiV8slgovpGh9Pvr yxwxWnMZhAj7obBrHjP9saRtuuU0yxFk+hxE0MOrWHqr+T709WITdxv0HE7ZqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722767047; a=rsa-sha256; cv=none; b=kvcn8U2+GCRE/Xqr0eh0uG67CRdeYiLg0PzQFrRna4iUYRn4Q2LEzLupcXBfZUhN/6sLuf RDN1WD8Zw/S0vn7JophQY019PMYABargHIfWKPtqU+UDfceucDbpgluJxbRx35X2Pu5+wr Ogod8NckHAf+0GXJgHq4mkd6g+UHIALhC1TQRlMpbMDbQU94bHgAI3Mt6FmuUpoQr4/MT6 wvsj4tEc2/6qOIMUNFeR7Z7utfgZciGvDgsQtnzGbHm0/cMHk6RT/9zuK/Z50knhKGo4AR +ReNYeUsgDrxICt2l0yez4mi0hpQ0x1CVy4KqWWvfIjAqYlC/IKFV4ugRafkbQ== 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=1722767047; 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=hNHrXTxTEmdoqwNjPkN0zaiIrD9oAxL8FXz/f5HNWy4=; b=KZ+PPNPSpdHM65VbWA2M38XcMmYhHLsAJKVZyqK4SaLLB/fFfLT/YxMD0VUXe5+anm5kw/ 5zfjW4FNaciKgyDh48Yc2VcLer/LfHpSrd8tWexpjffFQF/fqJstSi+UCRJoZcH8m/5XEz QP/0PvejznEsgaqKu6D0kGhxWUdVPBNK5xtT0KUPei2c2f8x0XfiY57jvtFA4eUVcQcFra 8yMmJfqfPC20PpA0gDh4JZtOmbqvQKz0HRrlwfYg5EVvXFKqBkH/5PQcKCUontXEnJQ8rM wv7SQbgwMHezjTnmxDTu5rShRRVXTrWv0Cpd1+TQnKWqZrP8qonhqeVdZziuNw== 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 4WcFzW5qSSzs9K; Sun, 4 Aug 2024 10:24:07 +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 474AO7YR046089; Sun, 4 Aug 2024 10:24:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 474AO7aY046086; Sun, 4 Aug 2024 10:24:07 GMT (envelope-from git) Date: Sun, 4 Aug 2024 10:24:07 GMT Message-Id: <202408041024.474AO7aY046086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 86e5bb86772c - stable/13 - Fix enum warning in heimdal 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 86e5bb86772cd61197b7b964c1c008223bfbbb32 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=86e5bb86772cd61197b7b964c1c008223bfbbb32 commit 86e5bb86772cd61197b7b964c1c008223bfbbb32 Author: Dimitry Andric AuthorDate: 2024-07-30 18:31:47 +0000 Commit: Dimitry Andric CommitDate: 2024-08-04 10:21:47 +0000 Fix enum warning in heimdal This fixes a clang 19 warning: crypto/heimdal/lib/krb5/deprecated.c:75:17: error: comparison of different enumeration types ('krb5_keytype' (aka 'enum ENCTYPE') and 'enum krb5_keytype_old') [-Werror,-Wenum-compare] 75 | if (keytype != KEYTYPE_DES || context->etypes_des == NULL) | ~~~~~~~ ^ ~~~~~~~~~~~ In https://github.com/heimdal/heimdal/commit/3bebbe5323 this was solved by adding a cast. That commit is rather large, so I'm only applying the one-liner here. MFC after: 3 days (cherry picked from commit 6f25b46721a18cf4f036d041e7e5d275800a00b3) --- crypto/heimdal/lib/krb5/deprecated.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/heimdal/lib/krb5/deprecated.c b/crypto/heimdal/lib/krb5/deprecated.c index e7c0105ebf7f..02cf7614f932 100644 --- a/crypto/heimdal/lib/krb5/deprecated.c +++ b/crypto/heimdal/lib/krb5/deprecated.c @@ -72,7 +72,7 @@ krb5_keytype_to_enctypes_default (krb5_context context, unsigned int i, n; krb5_enctype *ret; - if (keytype != KEYTYPE_DES || context->etypes_des == NULL) + if (keytype != (krb5_keytype)KEYTYPE_DES || context->etypes_des == NULL) return krb5_keytype_to_enctypes (context, keytype, len, val); for (n = 0; context->etypes_des[n]; ++n)