From 0941d6dbceba6c21a2d7d43700dc938f7c63f159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sun, 24 Jul 2011 21:29:27 -0700 Subject: [PATCH] add constant for WELLKNOWN:ORG.H5L realm --- kadmin/init.c | 2 +- kdc/fast.c | 4 ++-- lib/krb5/krb5.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kadmin/init.c b/kadmin/init.c index f9f4703df..7b615448e 100644 --- a/kadmin/init.c +++ b/kadmin/init.c @@ -233,7 +233,7 @@ init(struct init_options *opt, int argc, char **argv) /* Create `WELLKNONW/org.h5l.fast-cookie@WELLKNOWN:ORG.H5L' for FAST cookie */ - krb5_make_principal(context, &princ, "WELLKNOWN:ORG.H5L", + krb5_make_principal(context, &princ, KRB5_WELLKNOWN_ORG_H5L_REALM, KRB5_WELLKNOWN_NAME, "org.h5l.fast-cookie", NULL); create_random_entry(princ, 60*60, 60*60, KRB5_KDB_REQUIRES_PRE_AUTH| diff --git a/kdc/fast.c b/kdc/fast.c index 1d843f360..38e96a0fc 100644 --- a/kdc/fast.c +++ b/kdc/fast.c @@ -46,8 +46,8 @@ get_fastuser_crypto(kdc_request_t r, krb5_enctype enctype, krb5_crypto *crypto) *crypto = NULL; ret = krb5_make_principal(r->context, &fast_princ, - "WELLKNOWN:ORG.H5L", - "WELLKNOWN", "org.h5l.fast-cookie", NULL); + KRB5_WELLKNOWN_ORG_H5L_REALM, + KRB5_WELLKNOWN_NAME, "org.h5l.fast-cookie", NULL); if (ret) goto out; diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h index de3753a1c..5a7f4b2e1 100644 --- a/lib/krb5/krb5.h +++ b/lib/krb5/krb5.h @@ -686,6 +686,7 @@ typedef EncAPRepPart krb5_ap_rep_enc_part; #define KRB5_WELLKNOWN_NAME ("WELLKNOWN") #define KRB5_ANON_NAME ("ANONYMOUS") #define KRB5_ANON_REALM ("WELLKNOWN:ANONYMOUS") +#define KRB5_WELLKNOWN_ORG_H5L_REALM ("WELLKNOWN:ORG.H5L") #define KRB5_DIGEST_NAME ("digest") typedef enum {