From 1103fb19df3080787639a6931d646c698534d3a1 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Sat, 16 Apr 2016 16:41:59 -0500
Subject: [PATCH] Fix re-definition of keyex enum

---
 kdc/pkinit.c         | 2 +-
 lib/krb5/krb5_locl.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kdc/pkinit.c b/kdc/pkinit.c
index d92304ae9..28333fc56 100644
--- a/kdc/pkinit.c
+++ b/kdc/pkinit.c
@@ -47,7 +47,7 @@
 
 struct pk_client_params {
     enum krb5_pk_type type;
-    enum { USE_RSA, USE_DH, USE_ECDH } keyex;
+    enum keyex_enum keyex;
     union {
 	struct {
 	    BIGNUM *public_key;
diff --git a/lib/krb5/krb5_locl.h b/lib/krb5/krb5_locl.h
index cc39b8612..6be3a6f16 100644
--- a/lib/krb5/krb5_locl.h
+++ b/lib/krb5/krb5_locl.h
@@ -389,9 +389,11 @@ enum krb5_pk_type {
     PKINIT_27 = 2
 };
 
+enum keyex_enum { USE_RSA, USE_DH, USE_ECDH };
+
 struct krb5_pk_init_ctx_data {
     struct krb5_pk_identity *id;
-    enum { USE_RSA, USE_DH, USE_ECDH } keyex;
+    enum keyex_enum keyex;
     union {
 	DH *dh;
         void *eckey;