svn commit: r228538 - head/lib/libc/rpc

Dimitry Andric dim at FreeBSD.org
Thu Dec 15 20:27:37 UTC 2011


Author: dim
Date: Thu Dec 15 20:27:36 2011
New Revision: 228538
URL: http://svn.freebsd.org/changeset/base/228538

Log:
  In lib/libc/rpc/crypt_client.c, fix a clang warning about an implicit
  conversion between enum desdir/desmode from include/rpc/des.h, and enum
  desdir/desmode from include/rpcsvc/crypt.x.  These are actually
  different enums, with different value names, but by accident the integer
  representation of the enum values happened to be the same.
  
  MFC after:	1 week

Modified:
  head/lib/libc/rpc/crypt_client.c

Modified: head/lib/libc/rpc/crypt_client.c
==============================================================================
--- head/lib/libc/rpc/crypt_client.c	Thu Dec 15 20:10:12 2011	(r228537)
+++ head/lib/libc/rpc/crypt_client.c	Thu Dec 15 20:27:36 2011	(r228538)
@@ -75,8 +75,8 @@ _des_crypt_call(buf, len, dparms)
 
 	des_crypt_1_arg.desbuf.desbuf_len = len;
 	des_crypt_1_arg.desbuf.desbuf_val = buf;
-	des_crypt_1_arg.des_dir = dparms->des_dir;
-	des_crypt_1_arg.des_mode = dparms->des_mode;
+	des_crypt_1_arg.des_dir = (dparms->des_dir == ENCRYPT) ? ENCRYPT_DES : DECRYPT_DES;
+	des_crypt_1_arg.des_mode = (dparms->des_mode == CBC) ? CBC_DES : ECB_DES;
 	bcopy(dparms->des_ivec, des_crypt_1_arg.des_ivec, 8);
 	bcopy(dparms->des_key, des_crypt_1_arg.des_key, 8);
 


More information about the svn-src-head mailing list