git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

author Stephen Frost <sfrost@snowman.net>

Thu, 4 Apr 2019 15:11:46 +0000 (11:11 -0400)

committer Stephen Frost <sfrost@snowman.net>

Thu, 4 Apr 2019 15:11:46 +0000 (11:11 -0400)

The be_gssapi_get_* prototypes were put close to similar ones for SSL-
but a bit too close since that meant they ended up only being included
for SSL-enabled builds. Move those to be under ENABLE_GSS instead.

Pointed out by Tom.

src/include/libpq/libpq-be.h patch | blob | blame | history

diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h

index 059218c85a3df31ed5de0334ec66fa6b9847742e..b135ef9d9fd520b3203f15c09d9e89bd34e50b46 100644 (file)

--- a/src/include/libpq/libpq-be.h

+++ b/src/include/libpq/libpq-be.h

@@ -269,13 +269,6 @@ extern void be_tls_get_peer_subject_name(Port *port, char *ptr, size_t len);

extern void be_tls_get_peer_issuer_name(Port *port, char *ptr, size_t len);

extern void be_tls_get_peer_serial(Port *port, char *ptr, size_t len);

-/*

- * Return information about the GSSAPI authenticated connection

- */

-extern bool be_gssapi_get_auth(Port *port);

-extern bool be_gssapi_get_enc(Port *port);

-extern const char *be_gssapi_get_princ(Port *port);

* Get the server certificate hash for SCRAM channel binding type

* tls-server-end-point.

@@ -294,6 +287,13 @@ extern char *be_tls_get_certificate_hash(Port *port, size_t *len);

#endif /* USE_SSL */

#ifdef ENABLE_GSS

+/*

+ * Return information about the GSSAPI authenticated connection

+ */

+extern bool be_gssapi_get_auth(Port *port);

+extern bool be_gssapi_get_enc(Port *port);

+extern const char *be_gssapi_get_princ(Port *port);

/* Read and write to a GSSAPI-encrypted connection. */

extern ssize_t be_gssapi_read(Port *port, void *ptr, size_t len);

extern ssize_t be_gssapi_write(Port *port, void *ptr, size_t len);

This is the main PostgreSQL git repository.

RSS Atom