From: Ken Raeburn <raeburn@mit.edu>
Date: Tue, 25 Apr 2006 05:09:48 +0000 (+0000)
Subject: Change name of kdb function-table symbol from being derived from the
X-Git-Tag: krb5-1.5-alpha1~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eda666739030a3b0c5aa71248a5a8fc3319a93bf;p=krb5.git

Change name of kdb function-table symbol from being derived from the
name of the library file (which may not be acceptable as a C symbol
name anyways) to "kdb_function_table" always.

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

diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index ce66474a8..e80259f9f 100644
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -356,10 +356,8 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library * lib)
 	(*lib)->dl_handle = dlopen(dl_name, RTLD_NOW);
 	if ((*lib)->dl_handle) {
 	    /* found the module */
-	    sprintf(dl_name, "krb5_db_vftabl_%s", lib_name);
-
 	    dlerror();
-	    vftabl_addr = dlsym((*lib)->dl_handle, dl_name);
+	    vftabl_addr = dlsym((*lib)->dl_handle, "kdb_function_table");
 	    if (vftabl_addr) {
 		memcpy(&(*lib)->vftabl, vftabl_addr, sizeof(kdb_vftabl));
 
diff --git a/src/plugins/kdb/db2/db2.exports b/src/plugins/kdb/db2/db2.exports
index 25320ff72..f2b7c1119 100644
--- a/src/plugins/kdb/db2/db2.exports
+++ b/src/plugins/kdb/db2/db2.exports
@@ -1 +1 @@
-krb5_db_vftabl_db2
+kdb_function_table
diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c
index 8938c6d4a..a84e55a19 100644
--- a/src/plugins/kdb/db2/db2_exp.c
+++ b/src/plugins/kdb/db2/db2_exp.c
@@ -216,7 +216,7 @@ hack_cleanup (void)
  *      Exposed API
  */
 
-kdb_vftabl krb5_db_vftabl_db2 = {
+kdb_vftabl kdb_function_table = {
   1,                                      /* major version number 1 */
   0,                                      /* minor version number 0 */
   /* init_library */			       hack_init,