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

Add krb5_parse_name_flags.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18531 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-17 16:44:42 +00:00
parent e20d1475ce
commit aa111ad072
1 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/krb5/principal.c
View File

@@ -92,9 +92,10 @@ krb5_principal_get_comp_string(krb5_context context,
} }
krb5_error_code KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_FUNCTION
krb5_parse_name(krb5_context context, krb5_parse_name_flags(krb5_context context,
const char *name, const char *name,
krb5_principal *principal) int flags,
krb5_principal *principal)
{ {
krb5_error_code ret; krb5_error_code ret;
heim_general_string *comp; heim_general_string *comp;
@@ -112,6 +113,15 @@ krb5_parse_name(krb5_context context,
*principal = NULL; *principal = NULL;
#define RFLAGS (KRB5_PRINCIPAL_PARSE_NO_REALM|KRB5_PRINCIPAL_PARSE_MUST_REALM)
if ((flags & RFLAGS) == RFLAGS) {
krb5_set_error_string(context, "Can't require both realm and "
"no realm at the same time");
return KRB5_ERR_NO_SERVICE;
}
#undef RFLAGS
/* count number of component */ /* count number of component */
ncomp = 1; ncomp = 1;
for(p = name; *p; p++){ for(p = name; *p; p++){
@@ -187,6 +197,12 @@ krb5_parse_name(krb5_context context,
*q++ = c; *q++ = c;
} }
if(got_realm){ if(got_realm){
if (flags & KRB5_PRINCIPAL_PARSE_NO_REALM) {
krb5_set_error_string (context, "realm found in 'short' principal "
"expected to be without one");
ret = KRB5_PARSE_MALFORMED;
goto exit;
}
realm = malloc(q - start + 1); realm = malloc(q - start + 1);
if (realm == NULL) { if (realm == NULL) {
krb5_set_error_string (context, "malloc: out of memory"); krb5_set_error_string (context, "malloc: out of memory");
@@ -196,9 +212,18 @@ krb5_parse_name(krb5_context context,
memcpy(realm, start, q - start); memcpy(realm, start, q - start);
realm[q - start] = 0; realm[q - start] = 0;
}else{ }else{
ret = krb5_get_default_realm (context, &realm); if (flags & KRB5_PRINCIPAL_PARSE_MUST_REALM) {
if (ret) krb5_set_error_string (context, "realm NOT found in principal "
"expected to be with one");
ret = KRB5_PARSE_MALFORMED;
goto exit; goto exit;
} else if (flags & KRB5_PRINCIPAL_PARSE_NO_REALM) {
realm = NULL;
} else {
ret = krb5_get_default_realm (context, &realm);
if (ret)
goto exit;
}
comp[n] = malloc(q - start + 1); comp[n] = malloc(q - start + 1);
if (comp[n] == NULL) { if (comp[n] == NULL) {
@@ -232,6 +257,14 @@ exit:
return ret; return ret;
} }
krb5_error_code KRB5_LIB_FUNCTION
krb5_parse_name(krb5_context context,
const char *name,
krb5_principal *principal)
{
return krb5_parse_name_flags(context, name, 0, principal);
}
static const char quotable_chars[] = " \n\t\b\\/@"; static const char quotable_chars[] = " \n\t\b\\/@";
static const char replace_chars[] = " ntb\\/@"; static const char replace_chars[] = " ntb\\/@";