Blame SOURCES/Merge-duplicate-subsections-in-profile-library.patch

665228
From 7e2b7bb44c4996c425a93f6aacf151480cd08595 Mon Sep 17 00:00:00 2001
665228
From: Robbie Harwood <rharwood@redhat.com>
665228
Date: Tue, 10 Apr 2018 15:55:41 -0400
665228
Subject: [PATCH] Merge duplicate subsections in profile library
665228
665228
Modify profile_add_node() to return the existing node, rather than
665228
making a new one, when adding subsection configuration.
665228
665228
This fixes an issue where the first instance of a subsection will hide
665228
the second instance entirely.  In particular, it was previously
665228
impossible to split realm-specific configuration across multiple
665228
config files.
665228
665228
[ghudson@mit.edu: adjusted style, added test case]
665228
665228
(cherry picked from commit efab9fa5a6d23c486467264e20b58bf5a9c60f0c)
665228
665228
ticket: 7863
665228
version_fixed: 1.16.1
665228
665228
(cherry picked from commit 98d0061c8083af960438ad1ac088f60497694a68)
665228
---
665228
 src/util/profile/prof_test1  | 22 ++++++++++++++++++++++
665228
 src/util/profile/prof_tree.c | 15 +++++++++++----
665228
 src/util/profile/test.ini    |  6 ++++++
665228
 3 files changed, 39 insertions(+), 4 deletions(-)
665228
665228
diff --git a/src/util/profile/prof_test1 b/src/util/profile/prof_test1
665228
index 7e30fc12f..7d13c9389 100644
665228
--- a/src/util/profile/prof_test1
665228
+++ b/src/util/profile/prof_test1
665228
@@ -341,6 +341,27 @@ proc test9 {} {
665228
     puts "OK: test9: profile_flush_to_file with no changes"
665228
 }
665228
 
665228
+proc test10 {} {
665228
+    global wd verbose
665228
+
665228
+    # Regression test for #7863: multiply-specified subsections should
665228
+    # be merged.
665228
+    set p [profile_init_path $wd/test2.ini]
665228
+    set x [profile_get_values $p {{test section 2} child_section2 child}]
665228
+    if $verbose { puts "Read $x from profile" }
665228
+    if ![string equal $x "slick harry {john\tb } ron"] {
665228
+	puts stderr "Error: test10: Did not get expected merged children."
665228
+	exit 1
665228
+    }
665228
+
665228
+    set x [profile_get_string $p {test section 2} child_section2 chores]
665228
+    if $verbose { puts "Read $x from profile" }
665228
+    if ![string equal $x "cleaning"] {
665228
+	puts stderr "Error: test10: Did not find expected chores."
665228
+	exit 1
665228
+    }
665228
+}
665228
+
665228
 test1
665228
 test2
665228
 test3
665228
@@ -350,5 +371,6 @@ test6
665228
 test7
665228
 test8
665228
 test9
665228
+test10
665228
 
665228
 exit 0
665228
diff --git a/src/util/profile/prof_tree.c b/src/util/profile/prof_tree.c
665228
index 081f688e4..38aadc4e5 100644
665228
--- a/src/util/profile/prof_tree.c
665228
+++ b/src/util/profile/prof_tree.c
665228
@@ -9,7 +9,7 @@
665228
  *
665228
  * Each node may represent either a relation or a section header.
665228
  *
665228
- * A section header must have its value field set to 0, and may a one
665228
+ * A section header must have its value field be null, and may have one
665228
  * or more child nodes, pointed to by first_child.
665228
  *
665228
  * A relation has as its value a pointer to allocated memory
665228
@@ -159,15 +159,22 @@ errcode_t profile_add_node(struct profile_node *section, const char *name,
665228
         return PROF_ADD_NOT_SECTION;
665228
 
665228
     /*
665228
-     * Find the place to insert the new node.  We look for the
665228
-     * place *after* the last match of the node name, since
665228
+     * Find the place to insert the new node.  If we are adding a subsection
665228
+     * and already have a subsection with that name, merge them.  Otherwise,
665228
+     * we look for the place *after* the last match of the node name, since
665228
      * order matters.
665228
      */
665228
     for (p=section->first_child, last = 0; p; last = p, p = p->next) {
665228
         int cmp;
665228
         cmp = strcmp(p->name, name);
665228
-        if (cmp > 0)
665228
+        if (cmp > 0) {
665228
             break;
665228
+        } else if (value == NULL && cmp == 0 &&
665228
+                   p->value == NULL && p->deleted != 1) {
665228
+            /* Found duplicate subsection, so don't make a new one. */
665228
+            *ret_node = p;
665228
+            return 0;
665228
+        }
665228
     }
665228
     retval = profile_create_node(name, value, &new;;
665228
     if (retval)
665228
diff --git a/src/util/profile/test.ini b/src/util/profile/test.ini
665228
index 23ca89677..6622df108 100644
665228
--- a/src/util/profile/test.ini
665228
+++ b/src/util/profile/test.ini
665228
@@ -10,6 +10,12 @@ this is a comment.  Everything up to the first square brace is ignored.
665228
 	}
665228
 	child_section2 = foo
665228
 
665228
+[test section 2]
665228
+	child_section2 = {
665228
+		child = ron
665228
+		chores = cleaning
665228
+	}
665228
+
665228
 [realms]
665228
 ATHENA.MIT.EDU = {
665228
 	server = KERBEROS.MIT.EDU:88