From fad2ee55e18e6a6cedfe8541d8b7c6a0dfa2c186 Mon Sep 17 00:00:00 2001
From: Jimmy Brisson <theotherjimmy@gmail.com>
Date: Thu, 1 Feb 2018 17:02:02 -0600
Subject: [PATCH] Restrict target_overries usage

---
 tools/config/definitions.json | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/tools/config/definitions.json b/tools/config/definitions.json
index e18d2687e1..bfe83147e9 100644
--- a/tools/config/definitions.json
+++ b/tools/config/definitions.json
@@ -29,11 +29,7 @@
     "type": "object",
     "patternProperties": {
       "\\*": {
-        "type": "object",
-        "patternProperties": {
-          ".*\\..*": {}
-        },
-        "additionalProperties": false
+        "$ref": "#/target_override_entry"
       },
       "^\\S+$": {
         "$ref": "#/target_override_entry"
@@ -69,6 +65,7 @@
   },
   "config_parameter_short": {
     "type": [
+      "array",
       "string",
       "integer",
       "boolean",
@@ -88,7 +85,15 @@
   "target_override_entry": {
     "type": "object",
     "patternProperties": {
-      "^\\S+$": {}
+      "^\\S+$": {
+        "type": [
+          "array",
+          "string",
+          "integer",
+          "boolean",
+          "null"
+        ]
+      }
     },
     "additionalProperties": false
   }