Merging upstream version 2.1.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 38 insertions, 4 deletions

diff --git a/include/crm/common/options_internal.h b/include/crm/common/options_internal.h
index 4157b58..5c561fd 100644
--- a/include/crm/common/options_internal.h
+++ b/include/crm/common/options_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the Pacemaker project contributors
+ * Copyright 2006-2023 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -26,7 +26,7 @@ _Noreturn void pcmk__cli_help(char cmd);
  */
 
 const char *pcmk__env_option(const char *option);
-void pcmk__set_env_option(const char *option, const char *value);
+void pcmk__set_env_option(const char *option, const char *value, bool compat);
 bool pcmk__env_option_enabled(const char *daemon, const char *option);
 
 
@@ -76,18 +76,52 @@ long pcmk__auto_watchdog_timeout(void);
 bool pcmk__valid_sbd_timeout(const char *value);
 
 // Constants for environment variable names
+#define PCMK__ENV_AUTHKEY_LOCATION          "authkey_location"
 #define PCMK__ENV_BLACKBOX                  "blackbox"
+#define PCMK__ENV_CALLGRIND_ENABLED         "callgrind_enabled"
 #define PCMK__ENV_CLUSTER_TYPE              "cluster_type"
 #define PCMK__ENV_DEBUG                     "debug"
+#define PCMK__ENV_DH_MAX_BITS               "dh_max_bits"
+#define PCMK__ENV_DH_MIN_BITS               "dh_min_bits"
+#define PCMK__ENV_FAIL_FAST                 "fail_fast"
+#define PCMK__ENV_IPC_BUFFER                "ipc_buffer"
+#define PCMK__ENV_IPC_TYPE                  "ipc_type"
 #define PCMK__ENV_LOGFACILITY               "logfacility"
 #define PCMK__ENV_LOGFILE                   "logfile"
+#define PCMK__ENV_LOGFILE_MODE              "logfile_mode"
 #define PCMK__ENV_LOGPRIORITY               "logpriority"
-#define PCMK__ENV_MCP                       "mcp"
+#define PCMK__ENV_NODE_ACTION_LIMIT         "node_action_limit"
 #define PCMK__ENV_NODE_START_STATE          "node_start_state"
+#define PCMK__ENV_PANIC_ACTION              "panic_action"
 #define PCMK__ENV_PHYSICAL_HOST             "physical_host"
+#define PCMK__ENV_REMOTE_ADDRESS            "remote_address"
+#define PCMK__ENV_REMOTE_PID1               "remote_pid1"
+#define PCMK__ENV_REMOTE_PORT               "remote_port"
+#define PCMK__ENV_RESPAWNED                 "respawned"
+#define PCMK__ENV_SCHEMA_DIRECTORY          "schema_directory"
+#define PCMK__ENV_SERVICE                   "service"
+#define PCMK__ENV_STDERR                    "stderr"
+#define PCMK__ENV_TLS_PRIORITIES            "tls_priorities"
+#define PCMK__ENV_TRACE_BLACKBOX            "trace_blackbox"
+#define PCMK__ENV_TRACE_FILES               "trace_files"
+#define PCMK__ENV_TRACE_FORMATS             "trace_formats"
+#define PCMK__ENV_TRACE_FUNCTIONS           "trace_functions"
+#define PCMK__ENV_TRACE_TAGS                "trace_tags"
+#define PCMK__ENV_VALGRIND_ENABLED          "valgrind_enabled"
+
+// @COMPAT Drop at 3.0.0; default is plenty
+#define PCMK__ENV_CIB_TIMEOUT               "cib_timeout"
+
+// @COMPAT Drop at 3.0.0; likely last used in 1.1.24
+#define PCMK__ENV_MCP                       "mcp"
+
+// @COMPAT Drop at 3.0.0; added unused in 1.1.9
 #define PCMK__ENV_QUORUM_TYPE               "quorum_type"
+
+/* @COMPAT Drop at 3.0.0; added to debug shutdown issues when Pacemaker is
+ * managed by systemd, but no longer useful.
+ */
 #define PCMK__ENV_SHUTDOWN_DELAY            "shutdown_delay"
-#define PCMK__ENV_STDERR                    "stderr"
 
 // Constants for cluster option names
 #define PCMK__OPT_NODE_HEALTH_BASE          "node-health-base"