[28765] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.11]: Fix creation/rename of top-level profile
daemon@ATHENA.MIT.EDU (Tom Yu)
Fri Feb 6 18:51:13 2015
Date: Fri, 6 Feb 2015 18:44:48 -0500
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201502062344.t16NimeS001374@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/b1b5c398b54b834ede69162303134d7511cb3c08
commit b1b5c398b54b834ede69162303134d7511cb3c08
Author: Greg Hudson <ghudson@mit.edu>
Date: Wed Jul 16 16:30:26 2014 -0400
Fix creation/rename of top-level profile sections
profile_rename_section should demand only one name.
profile_add_relation should demand only one name if it is creating a
new section. It aso needs to reset state before calling
profile_find_node for the section, in case it didn't look up any
parent sections previously.
(cherry picked from commit 590df2f41f84e0f9492e08f7dbd26fbcd3118ea0)
ticket: 8118 (new)
version_fixed: 1.11.6
status: resolved
src/util/profile/prof_set.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/util/profile/prof_set.c b/src/util/profile/prof_set.c
index 52e5b05..c112429 100644
--- a/src/util/profile/prof_set.c
+++ b/src/util/profile/prof_set.c
@@ -211,7 +211,7 @@ profile_rename_section(profile_t profile, const char **names,
if (retval)
return retval;
- if (names == 0 || names[0] == 0 || names[1] == 0)
+ if (names == 0 || names[0] == 0)
return PROF_BAD_NAMESET;
retval = k5_mutex_lock(&profile->first_file->data->lock);
@@ -270,7 +270,8 @@ profile_add_relation(profile_t profile, const char **names,
if (retval)
return retval;
- if (names == 0 || names[0] == 0 || names[1] == 0)
+ /* Require at least two names for a new relation, one for a new section. */
+ if (names == 0 || names[0] == 0 || (names[1] == 0 && new_value))
return PROF_BAD_NAMESET;
retval = k5_mutex_lock(&profile->first_file->data->lock);
@@ -290,6 +291,7 @@ profile_add_relation(profile_t profile, const char **names,
}
if (new_value == 0) {
+ state = 0;
retval = profile_find_node(section, *cpp, 0, 1, &state, 0);
if (retval == 0) {
k5_mutex_unlock(&profile->first_file->data->lock);
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
