From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 1 Jun 2014 14:44:51 +0000 (-0400)
Subject: Remove stub pkinit_mapping_file code
X-Git-Tag: krb5-1.13-alpha1~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a12a0e57a8b9c752059fd0ee370c93ea589e4b7b;p=thirdparty%2Fkrb5.git

Remove stub pkinit_mapping_file code

As contributed, the PKINIT code contained code to read a mapping
filename, but never used the resulting structure variable.  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 ee1334b8b3..efaa162184 100644
--- a/src/plugins/preauth/pkinit/pkinit.h
+++ b/src/plugins/preauth/pkinit/pkinit.h
@@ -89,7 +89,6 @@ extern int longhorn;	    /* XXX Talking to a Longhorn server? */
 #define KRB5_CONF_PKINIT_KDC_HOSTNAME           "pkinit_kdc_hostname"
 #define KRB5_CONF_PKINIT_KDC_OCSP               "pkinit_kdc_ocsp"
 #define KRB5_CONF_PKINIT_LONGHORN               "pkinit_longhorn"
-#define KRB5_CONF_PKINIT_MAPPING_FILE           "pkinit_mapping_file"
 #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"
@@ -194,7 +193,6 @@ typedef struct _pkinit_identity_opts {
     char **intermediates;
     char **crls;
     char *ocsp;
-    char *dn_mapping_file;
     int  idtype;
     char *cert_filename;
     char *key_filename;
diff --git a/src/plugins/preauth/pkinit/pkinit_identity.c b/src/plugins/preauth/pkinit/pkinit_identity.c
index eb198f4f76..177a2cad82 100644
--- a/src/plugins/preauth/pkinit/pkinit_identity.c
+++ b/src/plugins/preauth/pkinit/pkinit_identity.c
@@ -126,7 +126,6 @@ pkinit_init_identity_opts(pkinit_identity_opts **idopts)
     opts->intermediates = NULL;
     opts->crls = NULL;
     opts->ocsp = NULL;
-    opts->dn_mapping_file = NULL;
 
     opts->cert_filename = NULL;
     opts->key_filename = NULL;
diff --git a/src/plugins/preauth/pkinit/pkinit_srv.c b/src/plugins/preauth/pkinit/pkinit_srv.c
index 1179216b5e..190e854414 100644
--- a/src/plugins/preauth/pkinit/pkinit_srv.c
+++ b/src/plugins/preauth/pkinit/pkinit_srv.c
@@ -1177,10 +1177,6 @@ pkinit_init_kdc_profile(krb5_context context, pkinit_kdc_context plgctx)
                              KRB5_CONF_PKINIT_KDC_OCSP,
                              &plgctx->idopts->ocsp);
 
-    pkinit_kdcdefault_string(context, plgctx->realmname,
-                             KRB5_CONF_PKINIT_MAPPING_FILE,
-                             &plgctx->idopts->dn_mapping_file);
-
     pkinit_kdcdefault_integer(context, plgctx->realmname,
                               KRB5_CONF_PKINIT_DH_MIN_BITS,
                               PKINIT_DEFAULT_DH_MIN_BITS,