database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-05 07:41:25 +03:00
Code Activity

libpq: Message style improvements

Browse Source
This commit is contained in:
Peter Eisentraut
2025-06-26 22:13:53 +02:00
parent 95e12d4d9b
commit 7fb3c38e7d
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/libpq/fe-connect.c
View File

@@ -2141,7 +2141,7 @@ pqConnectOptions2(PGconn *conn)
if (conn->min_pversion > conn->max_pversion) if (conn->min_pversion > conn->max_pversion)
{ {
conn->status = CONNECTION_BAD; conn->status = CONNECTION_BAD;
libpq_append_conn_error(conn, "min_protocol_version is greater than max_protocol_version"); libpq_append_conn_error(conn, "\"%s\" is greater than \"%s\"", "min_protocol_version", "max_protocol_version");
return false; return false;
} }

7
src/interfaces/libpq/fe-protocol3.c
View File

@@ -1434,7 +1434,7 @@ pqGetNegotiateProtocolVersion3(PGconn *conn)
/* 3.1 never existed, we went straight from 3.0 to 3.2 */ /* 3.1 never existed, we went straight from 3.0 to 3.2 */
if (their_version == PG_PROTOCOL(3, 1)) if (their_version == PG_PROTOCOL(3, 1))
{ {
libpq_append_conn_error(conn, "received invalid protocol negotiation message: server requests downgrade to non-existent 3.1 protocol version"); libpq_append_conn_error(conn, "received invalid protocol negotiation message: server requested downgrade to non-existent 3.1 protocol version");
goto failure; goto failure;
} }
@@ -1452,9 +1452,10 @@ pqGetNegotiateProtocolVersion3(PGconn *conn)
if (their_version < conn->min_pversion) if (their_version < conn->min_pversion)
{ {
libpq_append_conn_error(conn, "server only supports protocol version %d.%d, but min_protocol_version was set to %d.%d", libpq_append_conn_error(conn, "server only supports protocol version %d.%d, but \"%s\" was set to %d.%d",
PG_PROTOCOL_MAJOR(their_version), PG_PROTOCOL_MAJOR(their_version),
PG_PROTOCOL_MINOR(their_version), PG_PROTOCOL_MINOR(their_version),
"min_protocol_version",
PG_PROTOCOL_MAJOR(conn->min_pversion), PG_PROTOCOL_MAJOR(conn->min_pversion),
PG_PROTOCOL_MINOR(conn->min_pversion)); PG_PROTOCOL_MINOR(conn->min_pversion));
@@ -1476,7 +1477,7 @@ pqGetNegotiateProtocolVersion3(PGconn *conn)
} }
if (strncmp(conn->workBuffer.data, "_pq_.", 5) != 0) if (strncmp(conn->workBuffer.data, "_pq_.", 5) != 0)
{ {
libpq_append_conn_error(conn, "received invalid protocol negotiation message: server reported unsupported parameter name without a _pq_. prefix (\"%s\")", conn->workBuffer.data); libpq_append_conn_error(conn, "received invalid protocol negotiation message: server reported unsupported parameter name without a \"%s\" prefix (\"%s\")", "_pq_.", conn->workBuffer.data);
goto failure; goto failure;
} }
libpq_append_conn_error(conn, "received invalid protocol negotiation message: server reported an unsupported parameter that was not requested (\"%s\")", conn->workBuffer.data); libpq_append_conn_error(conn, "received invalid protocol negotiation message: server reported an unsupported parameter that was not requested (\"%s\")", conn->workBuffer.data);

4
src/interfaces/libpq/fe-secure-openssl.c
View File

@@ -711,7 +711,7 @@ SSL_CTX_keylog_cb(const SSL *ssl, const char *line)
if (fd == -1) if (fd == -1)
{ {
libpq_append_conn_error(conn, "could not open ssl keylog file \"%s\": %s", libpq_append_conn_error(conn, "could not open SSL key logging file \"%s\": %s",
conn->sslkeylogfile, pg_strerror(errno)); conn->sslkeylogfile, pg_strerror(errno));
return; return;
} }
@@ -719,7 +719,7 @@ SSL_CTX_keylog_cb(const SSL *ssl, const char *line)
/* line is guaranteed by OpenSSL to be NUL terminated */ /* line is guaranteed by OpenSSL to be NUL terminated */
rc = write(fd, line, strlen(line)); rc = write(fd, line, strlen(line));
if (rc < 0) if (rc < 0)
libpq_append_conn_error(conn, "could not write to ssl keylog file \"%s\": %s", libpq_append_conn_error(conn, "could not write to SSL key logging file \"%s\": %s",
conn->sslkeylogfile, pg_strerror(errno)); conn->sslkeylogfile, pg_strerror(errno));
else else
rc = write(fd, "\n", 1); rc = write(fd, "\n", 1);