From: Tom Yu <tlyu@mit.edu>
Date: Tue, 21 Dec 2004 20:22:14 +0000 (+0000)
Subject: pullup from trunk
X-Git-Tag: krb5-1.4.3-beta1~122
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fccadf8b29f2a295a1b7e1178284c048aed3f85b;p=krb5.git

pullup from trunk

ticket: 2840
version_fixed: 1.4

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index f5f5a2d3e..2cf9a9746 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-21  Tom Yu  <tlyu@mit.edu>
+
+	* krb5.hin: Flag krb5_principal2salt as KRB5_CALLCONV_WRONG.
+
 2004-12-08  Ken Raeburn  <raeburn@mit.edu>
 
 	* k5-int.h (KRB5INT_ACCESS_STRUCT_VERSION): Bump to 9.
diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 58fbfaa69..8cd270975 100644
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -1656,7 +1656,7 @@ krb5_error_code KRB5_CALLCONV krb5_kt_add_entry
 	(krb5_context,
 		krb5_keytab,
 		krb5_keytab_entry * );
-krb5_error_code krb5_principal2salt
+krb5_error_code KRB5_CALLCONV_WRONG krb5_principal2salt
 	(krb5_context,
 		krb5_const_principal, krb5_data *);
 #if KRB5_PRIVATE