Merge tag 'upstream/4.0.5+dfsg1' into samba_4.0_ivo

[abartlet/samba-debian.git] / source4 / heimdal / lib / krb5 / convert_creds.c

diff --git a/source4/heimdal/lib/krb5/convert_creds.c b/source4/heimdal/lib/krb5/convert_creds.c
index e700425ffe8ae19adf6408b6b822ab3f99120718..fc371c637764cbfe6a6187868ef190b6c3adb1ae 100644 (file)
--- a/source4/heimdal/lib/krb5/convert_creds.c
+++ b/source4/heimdal/lib/krb5/convert_creds.c
@@ -31,8 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#define KRB5_DEPRECATED
-
 #include "krb5_locl.h"
 #include "krb5-v4compat.h"
 
@@ -54,11 +52,11 @@
  * @ingroup krb5_v4compat
  */
 
-KRB5_DEPRECATED
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb524_convert_creds_kdc(krb5_context context,
                         krb5_creds *in_cred,
                         struct credentials *v4creds)
+    KRB5_DEPRECATED_FUNCTION("Use X instead")
 {
     memset(v4creds, 0, sizeof(*v4creds));
     krb5_set_error_message(context, EINVAL,
@@ -81,12 +79,12 @@ krb524_convert_creds_kdc(krb5_context context,
  * @ingroup krb5_v4compat
  */
 
-KRB5_DEPRECATED
 KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
 krb524_convert_creds_kdc_ccache(krb5_context context,
                                krb5_ccache ccache,
                                krb5_creds *in_cred,
                                struct credentials *v4creds)
+    KRB5_DEPRECATED_FUNCTION("Use X instead")
 {
     memset(v4creds, 0, sizeof(*v4creds));
     krb5_set_error_message(context, EINVAL,