diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-07-26 15:22:22 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-07-26 15:22:22 +0000 |
| commit | abc7f73273c36c9787f63414c30f649f4836c1ba (patch) | |
| tree | 1f3ab5425d8014d8a1c4c965f1081e70878a86da /src/backend/libpq/auth.c | |
| parent | 74ca68679602306a430fb465e1bf4ac514551838 (diff) | |
| download | postgresql-abc7f73273c36c9787f63414c30f649f4836c1ba.tar.gz postgresql-abc7f73273c36c9787f63414c30f649f4836c1ba.zip | |
Have SSL text print only when SSL mode is enabled.
Diffstat (limited to 'src/backend/libpq/auth.c')
| -rw-r--r-- | src/backend/libpq/auth.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index fd8d54a012d..b610100d2d1 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.106 2003/07/26 13:50:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.107 2003/07/26 15:22:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -440,15 +440,16 @@ ClientAuthentication(Port *port) NI_NUMERICHOST); #ifdef USE_SSL -#define EREPORT_SSL_STATUS (port->ssl ? "on" : "off") -#else -#define EREPORT_SSL_STATUS "off" -#endif - ereport(FATAL, (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION), errmsg("no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", SSL \"%s\"", - hostinfo, port->user_name, port->database_name, EREPORT_SSL_STATUS))); + hostinfo, port->user_name, port->database_name, port->ssl ? "on" : "off"))); +#else + ereport(FATAL, + (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION), + errmsg("no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\"", + hostinfo, port->user_name, port->database_name))); +#endif break; } |