Remove krb5_db_set_option and the associated DAL entry. It was not

used.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23965 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/kdb.h b/src/include/kdb.h
index 492e7364e2a743bacd41e3a89ff0b4e27afbc41b..5225a12e5246fdc843b3865f45c7f7bf32215f83 100644 (file)
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -417,7 +417,6 @@ const char * krb5_db_errcode2string ( krb5_context kcontext, long err_code );
 krb5_error_code krb5_db_destroy ( krb5_context kcontext, char **db_args );
 krb5_error_code krb5_db_promote ( krb5_context kcontext, char **db_args );
 krb5_error_code krb5_db_get_age ( krb5_context kcontext, char *db_name, time_t *t );
-krb5_error_code krb5_db_set_option ( krb5_context kcontext, int option, void *value );
 krb5_error_code krb5_db_lock ( krb5_context kcontext, int lock_mode );
 krb5_error_code krb5_db_unlock ( krb5_context kcontext );
 krb5_error_code krb5_db_get_principal ( krb5_context kcontext,
@@ -949,22 +948,6 @@ typedef struct _kdb_vftabl {
     krb5_error_code (*db_get_age)(krb5_context kcontext, char *db_name,
                                   time_t *age);
 
-    /*
-     * Optional: Set a database option.  This function is not currently used by
-     * any callers.  Behavior depends on the value of option:
-     *
-     * KRB5_KDB_OPT_SET_DB_NAME: Interpret value as a C string.  Set the
-     * database name (e.g. a filename for an embedded database).
-     *
-     * KRB5_KDB_OPT_SET_LOCK_MODE: Interpret value as a pointer to
-     * krb5_boolean.  If *value points to TRUE, set the database to
-     * non-blocking lock mode, causing operations to return OSA_ADB_CANTLOCK_DB
-     * when it would otherwise wait to obtain a lock.  Set *value to the old
-     * value of the non-blocking flag.
-     */
-    krb5_error_code (*db_set_option)(krb5_context kcontext, int option,
-                                     void *value);
-
     /*
      * Optional: Lock the database, with semantics depending on the mode
      * argument:

diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index 83dde5137dde5a393376dff2793d73e6f56f5857..a7e1bb5c1f2e5ad61e9e192ee8acd15a42cff717 100644 (file)
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -743,22 +743,6 @@ krb5_db_get_age(krb5_context kcontext, char *db_name, time_t * t)
     return status;
 }
 
-krb5_error_code
-krb5_db_set_option(krb5_context kcontext, int option, void *value)
-{
-    krb5_error_code status = 0;
-    kdb_vftabl *v;
-
-    status = get_vftabl(kcontext, &v);
-    if (status)
-        return status;
-    if (v->db_set_option == NULL)
-        return KRB5_KDB_DBTYPE_NOSUP;
-    status = v->db_set_option(kcontext, option, value);
-    get_errmsg(kcontext, status);
-    return status;
-}
-
 krb5_error_code
 krb5_db_lock(krb5_context kcontext, int lock_mode)
 {

diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c
index f96c1a4dd6c15fc8f9ddca10a0cf5f537e88e3ca..c7fb7566a0915e9c9ebbc36966f49845f526a1a5 100644 (file)
--- a/src/plugins/kdb/db2/db2_exp.c
+++ b/src/plugins/kdb/db2/db2_exp.c
@@ -110,11 +110,6 @@ WRAP_K (krb5_db2_db_get_age,
          char *s,
          time_t *t),
         (ctx, s, t));
-WRAP_K (krb5_db2_db_set_option,
-        ( krb5_context kcontext,
-          int option,
-          void *value ),
-        (kcontext, option, value));
 
 WRAP_K (krb5_db2_db_lock,
         ( krb5_context    context,
@@ -238,7 +233,6 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_db2, kdb_function_table) = {
     /* db_create */                              wrap_krb5_db2_create,
     /* db_destroy */                             wrap_krb5_db2_destroy,
     /* db_get_age */                             wrap_krb5_db2_db_get_age,
-    /* db_set_option */                          wrap_krb5_db2_db_set_option,
     /* db_lock */                                wrap_krb5_db2_db_lock,
     /* db_unlock */                              wrap_krb5_db2_db_unlock,
     /* db_get_principal */                       wrap_krb5_db2_db_get_principal,

diff --git a/src/plugins/kdb/db2/kdb_db2.c b/src/plugins/kdb/db2/kdb_db2.c
index 50d427ef5a617daae21899db74b553c3169b3c3a..65d7d3742ef51827407e8f0bb934dc7aac784c1e 100644 (file)
--- a/src/plugins/kdb/db2/kdb_db2.c
+++ b/src/plugins/kdb/db2/kdb_db2.c
@@ -1557,39 +1557,6 @@ krb5_db2_set_master_key_ext(krb5_context kcontext,
     return krb5_db2_db_set_mkey(kcontext, key);
 }
 
-krb5_error_code
-krb5_db2_db_set_option(krb5_context kcontext, int option, void *value)
-{
-    krb5_error_code status = 0;
-    krb5_boolean oldval;
-    krb5_db2_context *db_ctx;
-    kdb5_dal_handle *dal_handle;
-
-    if (!k5db2_inited(kcontext))
-        return KRB5_KDB_DBNOTINITED;
-
-    dal_handle = kcontext->dal_handle;
-    db_ctx = (krb5_db2_context *) dal_handle->db_context;
-
-
-    switch (option) {
-    case KRB5_KDB_OPT_SET_DB_NAME:
-        status = krb5_db2_db_set_name(kcontext, (char *) value, db_ctx->tempdb);
-        break;
-
-    case KRB5_KDB_OPT_SET_LOCK_MODE:
-        oldval = krb5_db2_db_set_lockmode(kcontext, *((krb5_boolean *) value));
-        *((krb5_boolean *) value) = oldval;
-        break;
-
-    default:
-        status = -1;            /* TBD */
-        break;
-    }
-
-    return status;
-}
-
 void   *
 krb5_db2_alloc(krb5_context kcontext, void *ptr, size_t size)
 {

diff --git a/src/plugins/kdb/hdb/kdb_hdb.c b/src/plugins/kdb/hdb/kdb_hdb.c
index f3668fa30703105706fc1d2e4273ae55fdf7e71f..89b06513d7f609e58adde091a82cd4713ea8ad9d 100644 (file)
--- a/src/plugins/kdb/hdb/kdb_hdb.c
+++ b/src/plugins/kdb/hdb/kdb_hdb.c
@@ -566,14 +566,6 @@ kh_db_get_age(krb5_context context,
     return KRB5_KDB_DBTYPE_NOSUP;
 }
 
-static krb5_error_code
-kh_db_set_option(krb5_context context,
-                 int option,
-                 void *value)
-{
-    return KRB5_KDB_DBTYPE_NOSUP;
-}
-
 static krb5_error_code
 kh_db_lock(krb5_context context, int kmode)
 {
@@ -1386,7 +1378,6 @@ kdb_vftabl kdb_function_table = {
     kh_db_create,
     kh_db_destroy,
     kh_db_get_age,
-    kh_db_set_option,
     kh_db_lock,
     kh_db_unlock,
     kh_db_get_principal,

diff --git a/src/plugins/kdb/ldap/ldap_exp.c b/src/plugins/kdb/ldap/ldap_exp.c
index 8deaf373792b5bb4e2845987169c47ae994321a6..13bbc9351aa778edbae063572d0023215ec32c6c 100644 (file)
--- a/src/plugins/kdb/ldap/ldap_exp.c
+++ b/src/plugins/kdb/ldap/ldap_exp.c
@@ -56,7 +56,6 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_ldap, kdb_function_table) = {
     /* db_create */                         krb5_ldap_create,
     /* db_destroy */                        krb5_ldap_delete_realm_1,
     /* db_get_age */                        krb5_ldap_db_get_age,
-    /* db_set_option */                     krb5_ldap_set_option,
     /* db_lock */                           krb5_ldap_lock,
     /* db_unlock */                         krb5_ldap_unlock,
     /* db_get_principal */                  krb5_ldap_get_principal,

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
index 1ca09b499d3b14c50c52d4f0ce07e00b93d98163..2130f8bc0a5bc570a9d07d16dbd25bf2ae86f1f6 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
@@ -303,9 +303,6 @@ krb5_ldap_free_server_context_params(krb5_ldap_context *ldap_context);
 /* DAL functions */
 
 
-krb5_error_code
-krb5_ldap_set_option( krb5_context, int, void * );
-
 krb5_error_code
 krb5_ldap_lock( krb5_context, int );
 

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
index f549e2393d4634d94c0870f0002852310acbd12e..65ae887345d342900670c89922701d77ca190925 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
@@ -1473,14 +1473,6 @@ krb5_add_int_mem_ldap_mod(LDAPMod ***mods, char *attribute, int op, int value)
     return 0;
 }
 
-krb5_error_code
-krb5_ldap_set_option(krb5_context kcontext, int option, void *value)
-{
-    krb5_error_code status = KRB5_PLUGIN_OP_NOTSUPP;
-    krb5_set_error_message(kcontext, status, "LDAP %s", error_message(status));
-    return status;
-}
-
 krb5_error_code
 krb5_ldap_lock(krb5_context kcontext, int mode)
 {