diff options
| author | Tom Yu <tlyu@mit.edu> | 1994-06-09 07:20:06 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1994-06-09 07:20:06 +0000 |
| commit | 3bf64880eb3040a3b8daaaf8d34afb0c84e7abc6 (patch) | |
| tree | 20405665950381650cb541a08a4e062ae99579dd | |
| parent | e87f95e4207835111a6034afd8561da42315cacd (diff) | |
| download | krb5-3bf64880eb3040a3b8daaaf8d34afb0c84e7abc6.tar.gz krb5-3bf64880eb3040a3b8daaaf8d34afb0c84e7abc6.tar.xz krb5-3bf64880eb3040a3b8daaaf8d34afb0c84e7abc6.zip | |
using get_realm_domain() now instead of rconv cruft
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3684 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/krb5/krb/conv_princ.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c index 2d2842817..98189aab4 100644 --- a/src/lib/krb5/krb/conv_princ.c +++ b/src/lib/krb5/krb/conv_princ.c @@ -67,11 +67,6 @@ static struct krb_convert sconv_list[] = { 0, 0, }; -static struct krb_convert rconv_list[] = { - "ATHENA.MIT.EDU", ".mit.edu", - 0, 0 -}; - /* * char *strnchr(s, c, n) * char *s; @@ -178,6 +173,8 @@ krb5_error_code krb5_425_conv_principal(name, instance, realm, princ) { struct krb_convert *p; char buf[256]; /* V4 instances are limited to 40 characters */ + krb5_error_code retval; + char *domain, *cp; if (instance) { if (instance[0] == '\0') { @@ -195,16 +192,16 @@ krb5_error_code krb5_425_conv_principal(name, instance, realm, princ) name = p->v5_str; if (p->flags & DO_REALM_CONVERSION) { strcpy(buf, instance); - p = rconv_list; - while (1) { - if (!p->v4_str) - break; - if (!strcmp(p->v4_str, realm)) - break; - p++; + retval = krb5_get_realm_domain(realm, &domain); + if (retval) + return retval; + if (domain) { + for (cp = domain; *cp; cp++) + if (isupper(*cp)) + *cp = tolower(*cp); + strcat(buf, domain); + krb5_xfree(domain); } - if (p->v5_str) - strcat(buf, p->v5_str); instance = buf; } } |