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

More error string, handle realm-less printing.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18548 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-18 06:53:22 +00:00
parent 4413356d16
commit bd5a0e8d6a
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/krb5/principal.c
View File

@@ -299,12 +299,20 @@ unparse_name_fixed(krb5_context context,
int short_form = (flags & KRB5_PRINCIPAL_UNPARSE_SHORT) != 0; int short_form = (flags & KRB5_PRINCIPAL_UNPARSE_SHORT) != 0;
int no_realm = (flags & KRB5_PRINCIPAL_UNPARSE_NO_REALM) != 0; int no_realm = (flags & KRB5_PRINCIPAL_UNPARSE_NO_REALM) != 0;
if (!no_realm && princ_realm(principal) == NULL) {
krb5_set_error_string(context, "Realm missing from principal, "
"can't unparse");
return ERANGE;
}
for(i = 0; i < princ_num_comp(principal); i++){ for(i = 0; i < princ_num_comp(principal); i++){
if(i) if(i)
add_char(name, idx, len, '/'); add_char(name, idx, len, '/');
idx = quote_string(princ_ncomp(principal, i), name, idx, len); idx = quote_string(princ_ncomp(principal, i), name, idx, len);
if(idx == len) if(idx == len) {
krb5_set_error_string(context, "Out of space printing principal");
return ERANGE; return ERANGE;
}
} }
/* add realm if different from default realm */ /* add realm if different from default realm */
if(short_form && !no_realm) { if(short_form && !no_realm) {
@@ -320,8 +328,11 @@ unparse_name_fixed(krb5_context context,
if(!short_form && !no_realm) { if(!short_form && !no_realm) {
add_char(name, idx, len, '@'); add_char(name, idx, len, '@');
idx = quote_string(princ_realm(principal), name, idx, len); idx = quote_string(princ_realm(principal), name, idx, len);
if(idx == len) if(idx == len) {
krb5_set_error_string(context,
"Out of space printing realm of principal");
return ERANGE; return ERANGE;
}
} }
return 0; return 0;
} }
@@ -365,12 +376,15 @@ unparse_name(krb5_context context,
int i; int i;
krb5_error_code ret; krb5_error_code ret;
/* count length */ /* count length */
plen = strlen(princ_realm(principal)); if (princ_realm(principal)) {
if(strcspn(princ_realm(principal), quotable_chars) == plen) plen = strlen(princ_realm(principal));
len += plen;
else if(strcspn(princ_realm(principal), quotable_chars) == plen)
len += 2*plen; len += plen;
len++; else
len += 2*plen;
len++; /* '@' */
}
for(i = 0; i < princ_num_comp(principal); i++){ for(i = 0; i < princ_num_comp(principal); i++){
plen = strlen(princ_ncomp(principal, i)); plen = strlen(princ_ncomp(principal, i));
if(strcspn(princ_ncomp(principal, i), quotable_chars) == plen) if(strcspn(princ_ncomp(principal, i), quotable_chars) == plen)
@@ -379,7 +393,7 @@ unparse_name(krb5_context context,
len += 2*plen; len += 2*plen;
len++; len++;
} }
len++; len++; /* '\0' */
*name = malloc(len); *name = malloc(len);
if(*name == NULL) { if(*name == NULL) {
krb5_set_error_string (context, "malloc: out of memory"); krb5_set_error_string (context, "malloc: out of memory");