diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h index 78b19b746..c999f4254 100644 --- a/lib/krb5/krb5.h +++ b/lib/krb5/krb5.h @@ -736,8 +736,8 @@ typedef krb5_error_code (*krb5_send_to_kdc_func)(krb5_context, /** flags for krb5_parse_name_flags */ enum { - KRB5_PRINCIPAL_PARSE_NO_REALM = 1, /**< Reqire that there are no realm */ - KRB5_PRINCIPAL_PARSE_MUST_REALM = 2, /**< Require a realm present */ + KRB5_PRINCIPAL_PARSE_NO_REALM = 1, /**< Require that there are no realm */ + KRB5_PRINCIPAL_PARSE_REQUIRE_REALM = 2, /**< Require a realm present */ KRB5_PRINCIPAL_PARSE_ENTERPRISE = 4 /**< Parse as a NT-ENTERPRISE name */ }; diff --git a/lib/krb5/krb5_principal.3 b/lib/krb5/krb5_principal.3 index 4b99b36a0..62b2e6d26 100644 --- a/lib/krb5/krb5_principal.3 +++ b/lib/krb5/krb5_principal.3 @@ -162,7 +162,7 @@ requries the input string to be without a realm, and no realm is stored in the .Fa principal return argument. -.It Dv KRB5_PRINCIPAL_PARSE_MUST_REALM +.It Dv KRB5_PRINCIPAL_PARSE_REQUIRE_REALM requries the input string to with a realm. .El .Pp diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c index f27355f2d..5db61ba55 100644 --- a/lib/krb5/principal.c +++ b/lib/krb5/principal.c @@ -162,7 +162,7 @@ krb5_parse_name_flags(krb5_context context, *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) { 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); realm[q - start] = 0; }else{ - if (flags & KRB5_PRINCIPAL_PARSE_MUST_REALM) { + if (flags & KRB5_PRINCIPAL_PARSE_REQUIRE_REALM) { ret = KRB5_PARSE_MALFORMED; krb5_set_error_message(context, ret, N_("realm NOT found in principal " diff --git a/lib/krb5/test_princ.c b/lib/krb5/test_princ.c index a3a029c05..c575ab8f4 100644 --- a/lib/krb5/test_princ.c +++ b/lib/krb5/test_princ.c @@ -206,14 +206,14 @@ test_princ(krb5_context context) free(princ_unparsed); ret = krb5_parse_name_flags(context, princ_short, - KRB5_PRINCIPAL_PARSE_MUST_REALM, + KRB5_PRINCIPAL_PARSE_REQUIRE_REALM, &p2); if (!ret) krb5_err(context, 1, ret, "Should have failed to parse %s " "because it lacked a realm", princ_short); ret = krb5_parse_name_flags(context, princ, - KRB5_PRINCIPAL_PARSE_MUST_REALM, + KRB5_PRINCIPAL_PARSE_REQUIRE_REALM, &p2); if (ret) krb5_err(context, 1, ret, "krb5_parse_name");