git: 1d5a5500ad4b - main - Fix enum warning in keyserv

The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=1d5a5500ad4b1f5187f40baaf58ab6868b18fc08

commit 1d5a5500ad4b1f5187f40baaf58ab6868b18fc08
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-07-30 22:35:03 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-07-31 19:28:42 +0000

    Fix enum warning in keyserv
    
    This fixes a clang 19 warning:
    
        usr.sbin/keyserv/crypt_server.c:237:53: error: comparison of different enumeration types ('des_mode' (aka 'enum des_mode') and 'enum desmode') [-Werror,-Wenum-compare]
          237 |         if (_my_crypt != &_arcfour_crypt && argp->des_mode == CBC) {
              |                                             ~~~~~~~~~~~~~~ ^  ~~~
    
    The type of `argp->des_mode` (aka `desargs::des_mode`) is `enum
    des_mode` from `/usr/include/rpcsvc/crypt.h`, not `enum desmode` from
    `/usr/include/rpc/des.h` (which is used in `struct desparams`).
    
    Luckily the integer values of `enum desmode`'s `CBC` and `ECB` are
    identical to those of `enum des_mode`'s `CBC_DES` and `ECB_DES`, so
    replace both values.
    
    MFC after:      3 days
---
 usr.sbin/keyserv/crypt_server.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c
index 99ce8b8bf1af..28e60b31c5c1 100644
--- a/usr.sbin/keyserv/crypt_server.c
+++ b/usr.sbin/keyserv/crypt_server.c
@@ -234,9 +234,9 @@ des_crypt_1_svc(desargs *argp, struct svc_req *rqstp)
 	 * getting ECB mode.
 	 */
 #ifdef BROKEN_DES
-	if (_my_crypt != &_arcfour_crypt && argp->des_mode == CBC) {
+	if (_my_crypt != &_arcfour_crypt && argp->des_mode == CBC_DES) {
 #else
-	if (_my_crypt != &_arcfour_crypt && argp->des_mode == ECB) {
+	if (_my_crypt != &_arcfour_crypt && argp->des_mode == ECB_DES) {
 #endif
 		int			i;
 		char			*dptr;