Windows: use krb5_get_error_message in netidmgr_plugin

Use krb5_get_error_message to translate krb5 error messages
to strings.

LICENSE MIT

Change-Id: Ia2fd5d655e4b0fa894ce724d4c123d2df433bb32
Reviewed-on: http://gerrit.openafs.org/1518
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/WINNT/netidmgr_plugin/dynimport.c b/src/WINNT/netidmgr_plugin/dynimport.c
index 51dcac3a7503193183e14726d26e99740cd5b30e..6e53793c4a4c4a7484a954a013ec0ad0ccef40d3 100644 (file)
--- a/src/WINNT/netidmgr_plugin/dynimport.c
+++ b/src/WINNT/netidmgr_plugin/dynimport.c
@@ -143,6 +143,8 @@ DECL_FUNC_PTR(krb5_free_host_realm);
 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_get_error_message);
+DECL_FUNC_PTR(krb5_free_error_message);
 
 // Krb524 functions
 DECL_FUNC_PTR(krb524_init_ets);
@@ -287,6 +289,8 @@ FUNC_INFO k5_fi[] = {
     MAKE_FUNC_INFO(krb5_free_host_realm),
     MAKE_FUNC_INFO(krb5_c_random_make_octets),
     MAKE_FUNC_INFO(krb5_free_default_realm),
+    MAKE_FUNC_INFO(krb5_get_error_message),
+    MAKE_FUNC_INFO(krb5_free_error_message),
     END_FUNC_INFO
 };
 

diff --git a/src/WINNT/netidmgr_plugin/krb5common.c b/src/WINNT/netidmgr_plugin/krb5common.c
index faaf6bcebd6bd3a471dbe5de7218b4a34bb0a270..4a95046cdf3358ca7d1f1a6d9029a5122f0ab02b 100644 (file)
--- a/src/WINNT/netidmgr_plugin/krb5common.c
+++ b/src/WINNT/netidmgr_plugin/krb5common.c
@@ -50,12 +50,13 @@ khm_krb5_error(krb5_error_code rc, LPCSTR FailedFunctionName,
     const char *errText;
     int krb5Error = ((int)(rc & 255));  
 
-    errText = perror_message(rc);   
+    errText = pkrb5_get_error_message(rc);
     _snprintf(message, sizeof(message), 
         "%s\n(Kerberos error %ld)\n\n%s failed", 
         errText, 
         krb5Error, 
         FailedFunctionName);
+    pkrb5_free_error_message(errText);
 
     MessageBoxA(NULL, message, "Kerberos Five", MB_OK | MB_ICONERROR | 
         MB_TASKMODAL |