oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(krb5_524_conv_principal): make it actually work, and check built-in

Browse Source 
list of host-type first-components


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5934 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-04-11 01:45:24 +00:00
parent f80803ca3b
commit 1f16233c48
1 changed files with 60 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
lib/krb5/principal.c
View File

@@ -704,9 +704,24 @@ krb5_425_conv_principal(krb5_context context,
} }
static char* static int
check_list(const krb5_config_binding *l, const char *name, const char **out)
{
while(l){
if (l->type != krb5_config_string)
continue;
if(strcmp(name, l->u.string) == 0) {
*out = l->name;
return 1;
}
l = l->next;
}
return 0;
}
static int
name_convert(krb5_context context, const char *name, const char *realm, name_convert(krb5_context context, const char *name, const char *realm,
const char *section) const char **out)
{ {
const krb5_config_binding *l; const krb5_config_binding *l;
l = krb5_config_get_list (context, l = krb5_config_get_list (context,
@@ -714,24 +729,47 @@ name_convert(krb5_context context, const char *name, const char *realm,
"realms", "realms",
realm, realm,
"v4_name_convert", "v4_name_convert",
section, "host",
NULL); NULL);
if(l == NULL) if(l && check_list(l, name, out))
l = krb5_config_get_list (context, return KRB5_NT_SRV_HST;
NULL, l = krb5_config_get_list (context,
"libdefaults", NULL,
"v4_name_convert", "libdefaults",
section, "v4_name_convert",
NULL); "host",
NULL);
if(l && check_list(l, name, out))
return KRB5_NT_SRV_HST;
l = krb5_config_get_list (context,
NULL,
"realms",
realm,
"v4_name_convert",
"plain",
NULL);
if(l && check_list(l, name, out))
return KRB5_NT_UNKNOWN;
l = krb5_config_get_list (context,
NULL,
"libdefaults",
"v4_name_convert",
"host",
NULL);
if(l && check_list(l, name, out))
return KRB5_NT_UNKNOWN;
while(l){ /* didn't find it in config file, try built-in list */
if (l->type != krb5_config_string) {
continue; struct v4_name_convert *q;
if(strcmp(name, l->u.string) == 0) for(q = default_v4_name_convert; q->from; q++) {
return l->name; if(strcmp(name, q->to) == 0) {
l = l->next; *out = q->from;
return KRB5_NT_SRV_HST;
}
}
} }
return NULL; return -1;
} }
krb5_error_code krb5_error_code
@@ -741,7 +779,7 @@ krb5_524_conv_principal(krb5_context context,
char *instance, char *instance,
char *realm) char *realm)
{ {
char *n, *i, *r; const char *n, *i, *r;
char tmpinst[40]; char tmpinst[40];
int type = princ_type(principal); int type = princ_type(principal);
@@ -761,16 +799,11 @@ krb5_524_conv_principal(krb5_context context,
} }
{ {
char *tmp = name_convert(context, n, r, "host"); const char *tmp;
if(tmp){ int t = name_convert(context, n, r, &tmp);
type = KRB5_NT_SRV_HST; if(t >= 0) {
type = t;
n = tmp; n = tmp;
}else{
tmp = name_convert(context, n, r, "plain");
if(tmp){
type = KRB5_NT_UNKNOWN;
n = tmp;
}
} }
} }