Remove stub pkinit_win2k code

As contributed, the PKINIT module contained code to read the
pkinit_win2k variable, but never used it.  Get rid of the structure
field and the code to populate it.

diff --git a/src/plugins/preauth/pkinit/pkinit.h b/src/plugins/preauth/pkinit/pkinit.h
index efaa1621842cf47154577309493f313fb74a98bc..328dee5b70a5628da3772b5149ad73c83f2c21c2 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit.h
+++ b/src/plugins/preauth/pkinit/pkinit.h
@@ -92,7 +92,6 @@ extern int longhorn;      /* XXX Talking to a Longhorn server? */
 #define KRB5_CONF_PKINIT_POOL                   "pkinit_pool"
 #define KRB5_CONF_PKINIT_REQUIRE_CRL_CHECKING   "pkinit_require_crl_checking"
 #define KRB5_CONF_PKINIT_REVOKE                 "pkinit_revoke"
-#define KRB5_CONF_PKINIT_WIN2K                  "pkinit_win2k"
 #define KRB5_CONF_PKINIT_WIN2K_REQUIRE_BINDING  "pkinit_win2k_require_binding"
 
 /* Make pkiDebug(fmt,...) print, or not.  */
@@ -178,7 +177,6 @@ typedef struct _pkinit_req_opts {
     int require_crl_checking;
     int dh_size;           /* initial request DH modulus size (default=1024) */
     int require_hostname_match;
-    int win2k_target;
     int win2k_require_cksum;
 } pkinit_req_opts;
 

diff --git a/src/plugins/preauth/pkinit/pkinit_clnt.c b/src/plugins/preauth/pkinit/pkinit_clnt.c
index 55b38811f757d1ff99ebc092b031f8db5611777d..b1c92dd0213ee8fe389270aeb1c32b8463871d71 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit_clnt.c
+++ b/src/plugins/preauth/pkinit/pkinit_clnt.c
@@ -948,10 +948,6 @@ pkinit_client_profile(krb5_context context,
     pkiDebug("pkinit_client_profile %p %p %p %p\n",
              context, plgctx, reqctx, realm);
 
-    pkinit_libdefault_boolean(context, realm,
-                              KRB5_CONF_PKINIT_WIN2K,
-                              reqctx->opts->win2k_target,
-                              &reqctx->opts->win2k_target);
     pkinit_libdefault_boolean(context, realm,
                               KRB5_CONF_PKINIT_WIN2K_REQUIRE_BINDING,
                               reqctx->opts->win2k_require_cksum,

diff --git a/src/plugins/preauth/pkinit/pkinit_lib.c b/src/plugins/preauth/pkinit/pkinit_lib.c
index a7bf54e3de73d460ed2a5e90337ba8b12ff66ff7..1cbbed7f07a4d54bc6d2d47a2168c312ae2ce46e 100644 (file)
--- a/src/plugins/preauth/pkinit/pkinit_lib.c
+++ b/src/plugins/preauth/pkinit/pkinit_lib.c
@@ -63,7 +63,6 @@ pkinit_init_req_opts(pkinit_req_opts **reqopts)
     opts->dh_or_rsa = DH_PROTOCOL;
     opts->require_crl_checking = 0;
     opts->dh_size = PKINIT_DEFAULT_DH_MIN_BITS;
-    opts->win2k_target = 0;
     opts->win2k_require_cksum = 0;
 
     *reqopts = opts;