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

back out 1.64

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8415 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-06-20 14:57:41 +00:00
parent a7b855ce27
commit 096a4473ed
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/krb5/principal.c
View File

@@ -547,9 +547,7 @@ struct v4_name_convert {
*/ */
static const char* static const char*
get_name_conversion(krb5_context context, get_name_conversion(krb5_context context, const char *realm, const char *name)
const char *realm,
const char *name)
{ {
struct v4_name_convert *q; struct v4_name_convert *q;
const char *p; const char *p;
@@ -605,7 +603,6 @@ krb5_425_conv_principal_ext(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
krb5_principal pr; krb5_principal pr;
char host[128]; char host[128];
char *low_realm = NULL;
/* do the following: if the name is found in the /* do the following: if the name is found in the
`v4_name_convert:host' part, is is assumed to be a `host' type `v4_name_convert:host' part, is is assumed to be a `host' type
@@ -689,19 +686,14 @@ krb5_425_conv_principal_ext(krb5_context context,
p = krb5_config_get_string(context, NULL, "realms", realm, p = krb5_config_get_string(context, NULL, "realms", realm,
"default_domain", NULL); "default_domain", NULL);
if(p == NULL){ if(p == NULL){
low_realm = strdup (realm); /* this should be an error, just faking a name is not good */
if (low_realm == NULL) return HEIM_ERR_V4_PRINC_NO_CONV;
return ENOMEM;
strlwr (low_realm);
p = low_realm;
} }
if (*p == '.') if (*p == '.')
++p; ++p;
snprintf(host, sizeof(host), "%s.%s", instance, p); snprintf(host, sizeof(host), "%s.%s", instance, p);
ret = krb5_make_principal(context, &pr, realm, name, host, NULL); ret = krb5_make_principal(context, &pr, realm, name, host, NULL);
if (low_realm)
free (low_realm);
if(func == NULL || (*func)(context, pr)){ if(func == NULL || (*func)(context, pr)){
*princ = pr; *princ = pr;
return 0; return 0;