[30797] in CVS-changelog-for-Kerberos-V5
krb5 commit: Add KRB5_PRINCIPAL_PARSE_NO_DEF_REALM flag
daemon@ATHENA.MIT.EDU (Greg Hudson)
Wed May 13 20:10:44 2020
Date: Wed, 13 May 2020 20:10:36 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-ID: <202005140010.04E0Aawh014530@drugstore.mit.edu>
To: <cvs-krb5@mit.edu>
MIME-Version: 1.0
Reply-To: krbdev@mit.edu
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/5975ab86bf0ab791282cf1103b8143cccd1034fd
commit 5975ab86bf0ab791282cf1103b8143cccd1034fd
Author: Greg Hudson <ghudson@mit.edu>
Date: Sun May 10 12:25:52 2020 -0400
Add KRB5_PRINCIPAL_PARSE_NO_DEF_REALM flag
Implement KRB5_PRINCIPAL_PARSE_NO_DEF_REALM from Heimdal. This flag
for krb5_parse_name_flags() suppresses the addition of the default
realm, but allows and preserves the realm if one is specified in the
string.
ticket: 8904 (new)
src/include/krb5/krb5.hin | 1 +
src/lib/krb5/krb/parse.c | 10 ++++------
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index c483ebc..fb4fa84 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -3430,6 +3430,7 @@ krb5_parse_name(krb5_context context, const char *name,
#define KRB5_PRINCIPAL_PARSE_ENTERPRISE 0x4 /**< Create single-component
enterprise principle */
#define KRB5_PRINCIPAL_PARSE_IGNORE_REALM 0x8 /**< Ignore realm if present */
+#define KRB5_PRINCIPAL_PARSE_NO_DEF_REALM 0x10 /**< Don't add default realm */
/**
* Convert a string principal name to a krb5_principal with flags.
diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c
index 1edb949..00c0ec1 100644
--- a/src/lib/krb5/krb/parse.c
+++ b/src/lib/krb5/krb/parse.c
@@ -183,6 +183,7 @@ krb5_parse_name_flags(krb5_context context, const char *name,
krb5_boolean require_realm = (flags & KRB5_PRINCIPAL_PARSE_REQUIRE_REALM);
krb5_boolean no_realm = (flags & KRB5_PRINCIPAL_PARSE_NO_REALM);
krb5_boolean ignore_realm = (flags & KRB5_PRINCIPAL_PARSE_IGNORE_REALM);
+ krb5_boolean no_def_realm = (flags & KRB5_PRINCIPAL_PARSE_NO_DEF_REALM);
*principal_out = NULL;
@@ -191,11 +192,8 @@ krb5_parse_name_flags(krb5_context context, const char *name,
goto cleanup;
parse_name_into_princ(name, enterprise, princ);
- /*
- * If a realm was not found, then use the default realm, unless
- * KRB5_PRINCIPAL_PARSE_NO_REALM was specified in which case the
- * realm will be empty.
- */
+ /* If a realm was not included, use the default realm, unless flags
+ * indicate otherwise. */
if (!has_realm) {
if (require_realm) {
ret = KRB5_PARSE_MALFORMED;
@@ -203,7 +201,7 @@ krb5_parse_name_flags(krb5_context context, const char *name,
_("Principal %s is missing required realm"), name);
goto cleanup;
}
- if (!no_realm && !ignore_realm) {
+ if (!no_realm && !ignore_realm && !no_def_realm) {
ret = krb5_get_default_realm(context, &default_realm);
if (ret)
goto cleanup;
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
