pullup from trunk

ticket: 2840

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

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index c6ad892429e688b3da7a6167ddaa43aa8858e583..11239044dde111806cc5fb21ae9524aac8cc078c 100644 (file)
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-18  Jeffrey Altman <jaltman@mit.edu>
+
+        * krb5_32.def: mark krb5_principal2salt as using the wrong 
+          calling convention.
+
 2004-12-15  Jeffrey Altman <jaltman@mit.edu>
 
         *.cvsignore, Makefile.in: rename krb5support32.def to k5sprt32.def

diff --git a/src/lib/krb5_32.def b/src/lib/krb5_32.def
index 58b4390df0f840a89883067bbc3753a1cbaa6d3c..95f8146723a0ec8cf1ee2134b0d47bed73b1b5a4 100644 (file)
--- a/src/lib/krb5_32.def
+++ b/src/lib/krb5_32.def
@@ -193,7 +193,7 @@ krb5_c_string_to_key_with_params
        krb5_os_localaddr
        krb5_parse_name
        krb5_principal_compare
-       krb5_principal2salt
+       krb5_principal2salt                     ; KRB5_CALLCONV_WRONG
        krb5_process_key
        krb5_prompter_posix
        krb5_random_key
@@ -211,8 +211,8 @@ krb5_c_string_to_key_with_params
        krb5_sendauth
        krb5_set_default_realm
        krb5_set_default_tgs_enctypes
-krb5_set_password
-krb5_set_password_using_ccache
+        krb5_set_password
+        krb5_set_password_using_ccache
        krb5_set_principal_realm
        krb5_set_real_time
        krb5_sname_to_principal