From 60c4de2ccfb92b131146aa4927fe17b9c1801bbc Mon Sep 17 00:00:00 2001
From: Alexandra Ellwood <lxs@mit.edu>
Date: Tue, 19 Aug 2008 16:49:18 +0000
Subject: [PATCH] Fixed export list for new hints functions and fixed calls to
 set error message.

ticket: 6055
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20671 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/kim/lib/kim.exports    | 14 ++------------
 src/kim/lib/kim_ccache.c   |  4 ++--
 src/kim/lib/kim_identity.c |  7 +++++--
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/kim/lib/kim.exports b/src/kim/lib/kim.exports
index 17c24f39e..5f94b3de1 100644
--- a/src/kim/lib/kim.exports
+++ b/src/kim/lib/kim.exports
@@ -53,18 +53,8 @@ kim_options_free
 
 kim_selection_hints_create
 kim_selection_hints_copy
-kim_selection_hints_set_service_identity_hint
-kim_selection_hints_get_service_identity_hint
-kim_selection_hints_set_client_realm_hint
-kim_selection_hints_get_client_realm_hint
-kim_selection_hints_set_user_hint
-kim_selection_hints_get_user_hint
-kim_selection_hints_set_service_realm_hint
-kim_selection_hints_get_service_realm_hint
-kim_selection_hints_set_service_hint
-kim_selection_hints_get_service_hint
-kim_selection_hints_set_server_hint
-kim_selection_hints_get_server_hint
+kim_selection_hints_set_hint
+kim_selection_hints_get_hint
 kim_selection_hints_set_application_name
 kim_selection_hints_get_application_name
 kim_selection_hints_set_explanation
diff --git a/src/kim/lib/kim_ccache.c b/src/kim/lib/kim_ccache.c
index 31a2af597..44a073c74 100644
--- a/src/kim/lib/kim_ccache.c
+++ b/src/kim/lib/kim_ccache.c
@@ -983,8 +983,8 @@ kim_error kim_ccache_set_default (kim_ccache io_ccache)
                 err = kim_ccache_get_display_name (io_ccache, &display_name);
                 
                 if (!err) {
-                    err = kim_error_create_from_code (KIM_CANT_BECOME_DEFAULT_ECODE, 
-                                                      display_name);
+                    err = kim_error_set_message_for_code (KIM_CANT_BECOME_DEFAULT_ECODE, 
+                                                          display_name);
                 }
                 
                 kim_string_free (&display_name);
diff --git a/src/kim/lib/kim_identity.c b/src/kim/lib/kim_identity.c
index 42a839a53..d2115561c 100644
--- a/src/kim/lib/kim_identity.c
+++ b/src/kim/lib/kim_identity.c
@@ -84,7 +84,8 @@ kim_error kim_identity_create_from_string (kim_identity *out_identity,
     if (!err) {
         krb5_error_code code = krb5_parse_name (identity->context, in_string, &identity->principal);
         if (code == KRB5_PARSE_MALFORMED) {
-            err = kim_error_create_from_code (KIM_BAD_PRINCIPAL_STRING_ECODE, in_string);
+            err = kim_error_set_message_for_code (KIM_BAD_PRINCIPAL_STRING_ECODE, 
+                                                  in_string);
         } else if (code) {
             err = krb5_error (identity->context, code);
         }
@@ -435,7 +436,9 @@ kim_error kim_identity_get_component_at_index (kim_identity  in_identity,
     if (!err) {
         krb5_int32 i = in_index;
         component = krb5_princ_component (in_identity->context, in_identity->principal, i);
-        if (!component) { err = kim_error_create_from_code (KIM_BAD_COMPONENT_INDEX_ECODE, i); }
+        if (!component) { 
+            err = kim_error_set_message_for_code (KIM_BAD_COMPONENT_INDEX_ECODE, i); 
+        }
     }
     
     if (!err) {
-- 
2.26.2