aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2005-12-30 00:13:50 +0000
committerPeter Eisentraut <peter_e@gmx.net>2005-12-30 00:13:50 +0000
commit810530020f7aacac4b243f3c66a21f1f8a9f2142 (patch)
treebc2bf3e9540bd499a1a4a18623af086a79c10be9
parentedafb4f037e7fd0eee14aaf9f263f154af5a6f66 (diff)
downloadpostgresql-810530020f7aacac4b243f3c66a21f1f8a9f2142.tar.gz
postgresql-810530020f7aacac4b243f3c66a21f1f8a9f2142.zip
Disallow setting ssl = on if SSL is not compiled in.
-rw-r--r--src/backend/utils/misc/guc.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 496aa706c82..124d2609b35 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.304 2005/12/28 16:38:38 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.305 2005/12/30 00:13:50 petere Exp $
*
*--------------------------------------------------------------------
*/
@@ -130,6 +130,7 @@ static const char *show_num_temp_buffers(void);
static bool assign_phony_autocommit(bool newval, bool doit, GucSource source);
static const char *assign_custom_variable_classes(const char *newval, bool doit,
GucSource source);
+static bool assign_ssl(bool newval, bool doit, GucSource source);
static bool assign_stage_log_stats(bool newval, bool doit, GucSource source);
static bool assign_log_stats(bool newval, bool doit, GucSource source);
static bool assign_transaction_read_only(bool newval, bool doit, GucSource source);
@@ -496,7 +497,7 @@ static struct config_bool ConfigureNamesBool[] =
NULL
},
&EnableSSL,
- false, NULL, NULL
+ false, assign_ssl, NULL
},
{
{"fsync", PGC_SIGHUP, WAL_SETTINGS,
@@ -5865,6 +5866,18 @@ assign_custom_variable_classes(const char *newval, bool doit, GucSource source)
}
static bool
+assign_ssl(bool newval, bool doit, GucSource source)
+{
+#ifndef USE_SSL
+ if (newval)
+ ereport(ERROR,
+ (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+ errmsg("SSL is not supported by this build")));
+#endif
+ return true;
+}
+
+static bool
assign_stage_log_stats(bool newval, bool doit, GucSource source)
{
if (newval && log_statement_stats)