From: John Kohl <jtkohl@mit.edu>
Date: Thu, 14 Feb 1991 14:50:54 +0000 (+0000)
Subject: fix erroneous define of process_v4
X-Git-Tag: krb5-1.0-alpha4~275
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1aaf6d5fe68fb019ea91a4ea9f06057f336333f0;p=krb5.git

fix erroneous define of process_v4
add norealm_salt

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1697 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kdc/kdc_util.h b/src/kdc/kdc_util.h
index 4f78c95e1..10bc56a5f 100644
--- a/src/kdc/kdc_util.h
+++ b/src/kdc/kdc_util.h
@@ -72,7 +72,15 @@ void kdc_insert_lookaside PROTOTYPE((krb5_data *, krb5_data *));
 #define clear(flagfield, flag) (flagfield &= ~(flag))
 
 #define realm_of_tgt(ticket) krb5_princ_realm(ticket->server)
+#ifdef KRB4
+krb5_error_code process_v4 PROTOTYPE((const krb5_data *,
+				      krb5_fulladdr *,
+				      krb5_data **));
+#else
 #define process_v4(foo,bar,foobar)	KRB5KRB_AP_ERR_BADVERSION
+#endif
+
+#define norealm_salt(princ, retdata) krb5_principal2salt(&(princ)[1], retdata)
 
 #ifndef	min
 #define	min(a, b)	((a) < (b) ? (a) : (b))