diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-09-06 19:54:52 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-09-06 19:54:52 +0000 |
| commit | ffd9aaa0a92842f00fd5107e3325876beae83eed (patch) | |
| tree | 9e19a4acf4024a959f0d215093223419e9f12311 /src/backend | |
| parent | 6dc249610a87aa8b9dcc8baf4e64d2e14d02f548 (diff) | |
| download | postgresql-ffd9aaa0a92842f00fd5107e3325876beae83eed.tar.gz postgresql-ffd9aaa0a92842f00fd5107e3325876beae83eed.zip | |
A bit of cleanup after SSL patch. Add it to config file, improve
documentation.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 20 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 3 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 59a42cd915e..748d8dbf787 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.165 2000/09/06 14:15:19 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.166 2000/09/06 19:54:46 petere Exp $ * * NOTES * @@ -193,10 +193,8 @@ static bool Reinit = true; static int SendStop = false; bool NetServer = false; /* listen on TCP/IP */ +bool EnableSSL = false; -#ifdef USE_SSL -static bool DisableSSL = false; /* Completely disable SSL, even if compiled in */ -#endif static pid_t StartupPID = 0, ShutdownPID = 0; @@ -452,7 +450,7 @@ PostmasterMain(int argc, char *argv[]) break; #ifdef USE_SSL case 'l': - DisableSSL = true; + EnableSSL = true; break; #endif case 'm': @@ -563,13 +561,13 @@ PostmasterMain(int argc, char *argv[]) } #ifdef USE_SSL - if (!NetServer && !DisableSSL) + if (EnableSSL && !NetServer) { - fprintf(stderr, "%s: For SSL, you must enable TCP/IP connections. Use -l to disable SSL\n", + fprintf(stderr, "%s: For SSL, TCP/IP connections must be enabled. See -? for help.\n", progname); exit(1); } - if (!DisableSSL) + if (EnableSSL) InitSSL(); #endif @@ -750,9 +748,9 @@ usage(const char *progname) printf(" -d 1-5 debugging level\n"); printf(" -D <directory> database directory\n"); printf(" -F turn fsync off\n"); - printf(" -i listen on TCP/IP sockets\n"); + printf(" -i enable TCP/IP connections\n"); #ifdef USE_SSL - printf(" -l disable SSL\n"); + printf(" -l enable SSL connections\n"); #endif printf(" -N <number> maximum number of allowed connections (1..%d, default %d)\n", MAXBACKENDS, DEF_MAXBACKENDS); @@ -1060,7 +1058,7 @@ readStartupPacket(void *arg, PacketLen len, void *pkt) char SSLok; #ifdef USE_SSL - if (DisableSSL || port->laddr.sa.sa_family != AF_INET) + if (!EnableSSL || port->laddr.sa.sa_family != AF_INET) /* No SSL when disabled or on Unix sockets */ SSLok = 'N'; else diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 09b236e25bb..1cbc4121a06 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -4,7 +4,7 @@ * Support for grand unified configuration scheme, including SET * command, configuration file, and command line options. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.10 2000/08/28 11:57:41 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.11 2000/09/06 19:54:47 petere Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. @@ -160,6 +160,7 @@ ConfigureNamesBool[] = {"geqo", PGC_USERSET, &enable_geqo, true}, {"tcpip_socket", PGC_POSTMASTER, &NetServer, false}, + {"ssl", PGC_POSTMASTER, &EnableSSL, false}, {"fsync", PGC_USERSET, &enableFsync, true}, {"log_connections", PGC_SIGHUP, &Log_connections, false}, |