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

Add `krb5_unparse_name_fixed_short', that excludes the realm if it's

Browse Source 
the same as the default realm.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4478 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-03-01 01:05:06 +00:00
parent bd465edee2
commit 5e284771a5
1 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lib/krb5/principal.c
View File

@@ -170,11 +170,12 @@ quote_string(const char *s, char *out, size_t index, size_t len)
} }
krb5_error_code static krb5_error_code
krb5_unparse_name_fixed(krb5_context context, unparse_name_fixed(krb5_context context,
krb5_const_principal principal, krb5_const_principal principal,
char *name, char *name,
size_t len) size_t len,
krb5_boolean short_form)
{ {
size_t index = 0; size_t index = 0;
int i; int i;
@@ -182,14 +183,45 @@ krb5_unparse_name_fixed(krb5_context context,
if(i) if(i)
add_char(name, index, len, '/'); add_char(name, index, len, '/');
index = quote_string(princ_ncomp(principal, i), name, index, len); index = quote_string(princ_ncomp(principal, i), name, index, len);
}
/* add realm if different from default realm */
if(short_form) {
krb5_realm r;
krb5_error_code ret;
ret = krb5_get_default_realm(context, &r);
if(ret)
return ret;
if(strcmp(princ_realm(principal), r) != 0)
short_form = 0;
free(r);
}
if(!short_form) {
add_char(name, index, len, '@');
index = quote_string(princ_realm(principal), name, index, len);
if(index == len)
return ENOMEM; /* XXX */
} }
add_char(name, index, len, '@');
index = quote_string(princ_realm(principal), name, index, len);
if(index == len)
return ENOMEM; /* XXX */
return 0; return 0;
} }
krb5_error_code
krb5_unparse_name_fixed(krb5_context context,
krb5_const_principal principal,
char *name,
size_t len)
{
return unparse_name_fixed(context, principal, name, len, FALSE);
}
krb5_error_code
krb5_unparse_name_fixed_short(krb5_context context,
krb5_const_principal principal,
char *name,
size_t len)
{
return unparse_name_fixed(context, principal, name, len, TRUE);
}
krb5_error_code krb5_error_code
krb5_unparse_name(krb5_context context, krb5_unparse_name(krb5_context context,
krb5_const_principal principal, krb5_const_principal principal,