From nobody Tue Jul 30 19:30:18 2024 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 4WYQL3089gz5RqKg; Tue, 30 Jul 2024 19:30:19 +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 4WYQL26mnhz4bpc; Tue, 30 Jul 2024 19:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722367819; 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=0YkL5+YWbfGKoqQbSTQrbc7g8iSRF8JXVEYdU6Pu2rg=; b=BF+EVysyOSaDpfY/9BVrDgDqrTp58c7AK2xEUAaixXrI3Snjwg33gbcXJEiFWuttomD9ys YOziaEAYfPL2ZlfZv87BefGCyUxQ0y9szEPfurjjUo853gFp6peoNvA04j8l2V0tjGTrjT ztOBqAmp2I7JKdBg0z4a4wPju+uCgTPttQrds/MNA5Kfb7QfEaxIL9f5g/ggfdF865UiiF /nkdzmK7MycYfJECYUp6cPc7SwQG8TwZrsPphPjVOaH+QiMXRmhL9I1A4/8tEMCVEIZkyL G3QCPdrpf9mwRXdnTZtYpW1ENY4Xg1JSApwUKkV5zjLOp1d9w1EfjnOPB49d+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722367818; a=rsa-sha256; cv=none; b=O9L5U9VMrR0fd7rR9moMQns38HtSNkEHhjfLLNsl26Nsj6193aEt3UxdZ0F48rct/4fBnW 5fl4iktc5kHCzYVVZ4QGBVLX4un1qfJFsB2fAM5oRBfqtbiqQEXbmzmiReMzlFcf+GYiLY aofy8gVVDrx4zjJEItRAzSjMxfCSjhnF9aqpK0G3JABHTcaR94+dyxrrfBRTASEd+tmQbj cn00JzcLShYgwyKXANnV58pOC9EssJH5MgJrZH7W+2ApwxGzlEy76vKlxFyMTcog/7bobR aWurv9xnlQR/cgaHi1cQCZ5eFynpInqEjJaHp7cZ0W4SxkMViZIYM91pkdc4rg== 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=1722367818; 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=0YkL5+YWbfGKoqQbSTQrbc7g8iSRF8JXVEYdU6Pu2rg=; b=weGTjRbkgULAAHy/YyuJdMEsS4jWGiEPz7+xJaWgGaqmKTV71zxTHSE/4QNZna10K8EwvF kG+rLN6+HnJVX3ReYyKT+saEKXQL9DWYqnuuRIs+p0bjoYdZZl/SY5XN2KtXWWVxkvYn/p tlnywOdNaB6iFF39v3/8rcBaXXyujipjhZfov3fdeQdgPnxjjCH681OKzZUK+tvVKBQHl3 p3OVtIR+8ueo4YEsrivCVJ2GHScWoExj4pDrP14+ZSOcfFtD11XGItSaGOGiouXp+XgofW VWbXN2qa1BpMI0ozNhdHKDmHfEPU/rRu5vP5PI/3Y82R9LCyP7c8Q+twatdoLQ== 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 4WYQL26NVLzWJ3; Tue, 30 Jul 2024 19:30:18 +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 46UJUI8N049517; Tue, 30 Jul 2024 19:30:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46UJUI4c049514; Tue, 30 Jul 2024 19:30:18 GMT (envelope-from git) Date: Tue, 30 Jul 2024 19:30:18 GMT Message-Id: <202407301930.46UJUI4c049514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 6f25b46721a1 - main - Fix enum warning in heimdal 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f25b46721a18cf4f036d041e7e5d275800a00b3 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6f25b46721a18cf4f036d041e7e5d275800a00b3 commit 6f25b46721a18cf4f036d041e7e5d275800a00b3 Author: Dimitry Andric AuthorDate: 2024-07-30 18:31:47 +0000 Commit: Dimitry Andric CommitDate: 2024-07-30 19:24:17 +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 --- 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)