diff options
| author | Tom Lane | 2007-02-16 17:07:00 +0000 |
|---|---|---|
| committer | Tom Lane | 2007-02-16 17:07:00 +0000 |
| commit | b6c9165ea0be3008fbb743ca9dfd1b2e3f0616d5 (patch) | |
| tree | efbe170578aee57018e6e86dee0368fde987e87c /src/backend/utils | |
| parent | 5ce7599bcd65f4ac8a629cba360c89ef7ba515b8 (diff) | |
Code review for SSLKEY patch.
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 11 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index b5d93d6d64d..dd84d65f890 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.375 2007/02/16 02:59:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.376 2007/02/16 17:07:00 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -106,6 +106,11 @@ extern bool fullPageWrites; extern bool trace_sort; #endif +#ifdef USE_SSL +extern char *SSLCipherSuites; +#endif + + static const char *assign_log_destination(const char *value, bool doit, GucSource source); @@ -2314,6 +2319,7 @@ static struct config_string ConfigureNamesString[] = NULL, assign_temp_tablespaces, NULL }, +#ifdef USE_SSL { {"ssl_ciphers", PGC_POSTMASTER, CONN_AUTH_SECURITY, gettext_noop("Sets the list of allowed SSL ciphers."), @@ -2323,7 +2329,8 @@ static struct config_string ConfigureNamesString[] = &SSLCipherSuites, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH", NULL, NULL }, - +#endif /* USE_SSL */ + /* End-of-list marker */ { {NULL, 0, 0, NULL, NULL}, NULL, NULL, NULL, NULL diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index ca5b2aafb11..703f5cbaa33 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -74,7 +74,8 @@ #authentication_timeout = 1min # 1s-600s #ssl = off # (change requires restart) -#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH' # List of ciphers to use +#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH' # Allowed SSL ciphers + # (change requires restart) #password_encryption = on #db_user_namespace = off |