Un-break custom_variable_classes kluge ... mea culpa.

diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index 08c070a1d4b716c18a108c9743c57857b75cf71a..ef27e47ebf44940912102369eb6c161a741abef2 100644 (file)
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -203,25 +203,28 @@ ProcessConfigFile(GucContext context)
                                if (token != GUC_EOL)
                                        goto parse_error;
 
-                               item = palloc(sizeof *item);
-                               item->name = opt_name;
-                               item->value = opt_value;
-
                                if (strcmp(opt_name, "custom_variable_classes") == 0)
                                {
                                        /*
                                         * This variable must be processed first as it controls
-                                        * the validity of other variables; so prepend to
-                                        * the list instead of appending.
+                                        * the validity of other variables; so apply immediately.
                                         */
-                                       item->next = head;
-                                       head = item;
-                                       if (!tail)
-                                               tail = item;
+                                       if (!set_config_option(opt_name, opt_value, context,
+                                                                                  PGC_S_FILE, false, true))
+                                       {
+                                               pfree(opt_name);
+                                               pfree(opt_value);
+                                               goto cleanup_exit;
+                                       }
+                                       pfree(opt_name);
+                                       pfree(opt_value);
                                }
                                else
                                {
                                        /* append to list */
+                                       item = palloc(sizeof *item);
+                                       item->name = opt_name;
+                                       item->value = opt_value;
                                        item->next = NULL;
                                        if (!head)
                                                head = item;