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

s/KRB5_PRINCIPAL_PARSE_MUST_REALM/KRB5_PRINCIPAL_PARSE_REQUIRE_REALM/

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24233 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-01-11 21:40:53 +00:00
parent d31a29f9e3
commit e3e8374234
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/krb5/krb5.h
View File

@@ -736,8 +736,8 @@ typedef krb5_error_code (*krb5_send_to_kdc_func)(krb5_context,
/** flags for krb5_parse_name_flags */ /** flags for krb5_parse_name_flags */
enum { enum {
KRB5_PRINCIPAL_PARSE_NO_REALM = 1, /**< Reqire that there are no realm */ KRB5_PRINCIPAL_PARSE_NO_REALM = 1, /**< Require that there are no realm */
KRB5_PRINCIPAL_PARSE_MUST_REALM = 2, /**< Require a realm present */ KRB5_PRINCIPAL_PARSE_REQUIRE_REALM = 2, /**< Require a realm present */
KRB5_PRINCIPAL_PARSE_ENTERPRISE = 4 /**< Parse as a NT-ENTERPRISE name */ KRB5_PRINCIPAL_PARSE_ENTERPRISE = 4 /**< Parse as a NT-ENTERPRISE name */
}; };

2
lib/krb5/krb5_principal.3
View File

@@ -162,7 +162,7 @@ requries the input string to be without a realm, and no realm is
stored in the stored in the
.Fa principal .Fa principal
return argument. return argument.
.It Dv KRB5_PRINCIPAL_PARSE_MUST_REALM .It Dv KRB5_PRINCIPAL_PARSE_REQUIRE_REALM
requries the input string to with a realm. requries the input string to with a realm.
.El .El
.Pp .Pp

4
lib/krb5/principal.c
View File

@@ -162,7 +162,7 @@ krb5_parse_name_flags(krb5_context context,
*principal = NULL; *principal = NULL;
#define RFLAGS (KRB5_PRINCIPAL_PARSE_NO_REALM|KRB5_PRINCIPAL_PARSE_MUST_REALM) #define RFLAGS (KRB5_PRINCIPAL_PARSE_NO_REALM|KRB5_PRINCIPAL_PARSE_REQUIRE_REALM)
if ((flags & RFLAGS) == RFLAGS) { if ((flags & RFLAGS) == RFLAGS) {
krb5_set_error_message(context, KRB5_ERR_NO_SERVICE, krb5_set_error_message(context, KRB5_ERR_NO_SERVICE,
@@ -276,7 +276,7 @@ krb5_parse_name_flags(krb5_context context,
memcpy(realm, start, q - start); memcpy(realm, start, q - start);
realm[q - start] = 0; realm[q - start] = 0;
}else{ }else{
if (flags & KRB5_PRINCIPAL_PARSE_MUST_REALM) { if (flags & KRB5_PRINCIPAL_PARSE_REQUIRE_REALM) {
ret = KRB5_PARSE_MALFORMED; ret = KRB5_PARSE_MALFORMED;
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
N_("realm NOT found in principal " N_("realm NOT found in principal "

4
lib/krb5/test_princ.c
View File

@@ -206,14 +206,14 @@ test_princ(krb5_context context)
free(princ_unparsed); free(princ_unparsed);
ret = krb5_parse_name_flags(context, princ_short, ret = krb5_parse_name_flags(context, princ_short,
KRB5_PRINCIPAL_PARSE_MUST_REALM, KRB5_PRINCIPAL_PARSE_REQUIRE_REALM,
&p2); &p2);
if (!ret) if (!ret)
krb5_err(context, 1, ret, "Should have failed to parse %s " krb5_err(context, 1, ret, "Should have failed to parse %s "
"because it lacked a realm", princ_short); "because it lacked a realm", princ_short);
ret = krb5_parse_name_flags(context, princ, ret = krb5_parse_name_flags(context, princ,
KRB5_PRINCIPAL_PARSE_MUST_REALM, KRB5_PRINCIPAL_PARSE_REQUIRE_REALM,
&p2); &p2);
if (ret) if (ret)
krb5_err(context, 1, ret, "krb5_parse_name"); krb5_err(context, 1, ret, "krb5_parse_name");