Commit 81053002 authored by Peter Eisentraut's avatar Peter Eisentraut

Disallow setting ssl = on if SSL is not compiled in.

parent edafb4f0
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
* *
* IDENTIFICATION * 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); ...@@ -130,6 +130,7 @@ static const char *show_num_temp_buffers(void);
static bool assign_phony_autocommit(bool newval, bool doit, GucSource source); static bool assign_phony_autocommit(bool newval, bool doit, GucSource source);
static const char *assign_custom_variable_classes(const char *newval, bool doit, static const char *assign_custom_variable_classes(const char *newval, bool doit,
GucSource source); 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_stage_log_stats(bool newval, bool doit, GucSource source);
static bool assign_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); static bool assign_transaction_read_only(bool newval, bool doit, GucSource source);
...@@ -496,7 +497,7 @@ static struct config_bool ConfigureNamesBool[] = ...@@ -496,7 +497,7 @@ static struct config_bool ConfigureNamesBool[] =
NULL NULL
}, },
&EnableSSL, &EnableSSL,
false, NULL, NULL false, assign_ssl, NULL
}, },
{ {
{"fsync", PGC_SIGHUP, WAL_SETTINGS, {"fsync", PGC_SIGHUP, WAL_SETTINGS,
...@@ -5864,6 +5865,18 @@ assign_custom_variable_classes(const char *newval, bool doit, GucSource source) ...@@ -5864,6 +5865,18 @@ assign_custom_variable_classes(const char *newval, bool doit, GucSource source)
return newval; return newval;
} }
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 static bool
assign_stage_log_stats(bool newval, bool doit, GucSource source) assign_stage_log_stats(bool newval, bool doit, GucSource source)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment