pull up r20571 from trunk

 r20571@cathode-dark-space:  jaltman | 2008-07-23 10:44:50 -0400
 ticket: 6046
 tags: pullup

 The /src/windows/identity/plugins/common/dynimport.{c,h} files are used
 by the NIM Kerberos v5 plug-ins for run-time dynamic linking.  They
 currently do not declare or import the following functions:

 krb5_get_error_message()
 krb5_free_error_message()
 krb5_clear_error_message()

 This patch adds declarations and definitions required for locating these
 functions.  Relies on the addition of these functions to the prototype
 list in the Pismere loadfuncs-krb5.h.  See ticket 6045.

ticket: 6046
version_fixed: 1.6.4
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20639 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/identity/plugins/common/dynimport.c b/src/windows/identity/plugins/common/dynimport.c
index ea8bbf905e0cd4d681873fbd2d14f2b682c72658..99a93dd2564d5559b24b4fc452bdbeb02392acbb 100644 (file)
--- a/src/windows/identity/plugins/common/dynimport.c
+++ b/src/windows/identity/plugins/common/dynimport.c
@@ -145,6 +145,9 @@ DECL_FUNC_PTR(krb5_c_random_make_octets);
 DECL_FUNC_PTR(krb5_free_addresses);
 DECL_FUNC_PTR(krb5_free_default_realm);
 DECL_FUNC_PTR(krb5_string_to_deltat);
+DECL_FUNC_PTR(krb5_get_error_message);
+DECL_FUNC_PTR(krb5_free_error_message);
+DECL_FUNC_PTR(krb5_clear_error_message);
 
 // Krb524 functions
 DECL_FUNC_PTR(krb524_init_ets);
@@ -293,6 +296,9 @@ FUNC_INFO k5_fi[] = {
     MAKE_FUNC_INFO(krb5_c_random_make_octets),
     MAKE_FUNC_INFO(krb5_free_default_realm),
     MAKE_FUNC_INFO(krb5_string_to_deltat),
+    MAKE_FUNC_INFO(krb5_get_error_message),
+    MAKE_FUNC_INFO(krb5_free_error_message),
+    MAKE_FUNC_INFO(krb5_clear_error_message),
     END_FUNC_INFO
 };
 

diff --git a/src/windows/identity/plugins/common/dynimport.h b/src/windows/identity/plugins/common/dynimport.h
index 2c0995cba011ab9b38f9da08810761515ca270f1..8660d6c0db68f13b92145c2f7795daaa20a5d4e6 100644 (file)
--- a/src/windows/identity/plugins/common/dynimport.h
+++ b/src/windows/identity/plugins/common/dynimport.h
@@ -272,6 +272,9 @@ extern DECL_FUNC_PTR(krb5_free_host_realm);
 extern DECL_FUNC_PTR(krb5_c_random_make_octets);
 extern DECL_FUNC_PTR(krb5_free_default_realm);
 extern DECL_FUNC_PTR(krb5_string_to_deltat);
+extern DECL_FUNC_PTR(krb5_get_error_message);
+extern DECL_FUNC_PTR(krb5_free_error_message);
+extern DECL_FUNC_PTR(krb5_clear_error_message);
 
 // Krb524 functions
 extern DECL_FUNC_PTR(krb524_init_ets);