diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2019-09-06 09:15:35 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2019-09-06 09:18:31 +0200 |
| commit | d57a931a85dff67fb7447da5f252bb9a9ecbb6d9 (patch) | |
| tree | 04cdc0bb3cbcc404e0d15e3e08a95a68a46f1457 | |
| parent | 7aa815a7aadd0dcc0515dfc3a88677deb0ca11ff (diff) | |
| download | postgresql-d57a931a85dff67fb7447da5f252bb9a9ecbb6d9.tar.gz postgresql-d57a931a85dff67fb7447da5f252bb9a9ecbb6d9.zip | |
libpq: ccache -> credential cache
The term "ccache" is overloaded. Let's be more clear, in case someone
other than a Kerberos wizard has to read this code.
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 8 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-gssapi-common.c | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-gssapi-common.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 7a4c7825547..3359f70b4cd 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -2747,13 +2747,13 @@ keep_going: /* We will come back to here until there is #ifdef ENABLE_GSS /* - * If GSSAPI is enabled and we have a ccache, try to set it up - * before sending startup messages. If it's already + * If GSSAPI is enabled and we have a credential cache, try to + * set it up before sending startup messages. If it's already * operating, don't try SSL and instead just build the startup * packet. */ if (conn->try_gss && !conn->gctx) - conn->try_gss = pg_GSS_have_ccache(&conn->gcred); + conn->try_gss = pg_GSS_have_cred_cache(&conn->gcred); if (conn->try_gss && !conn->gctx) { ProtocolVersion pv = pg_hton32(NEGOTIATE_GSS_CODE); @@ -2773,7 +2773,7 @@ keep_going: /* We will come back to here until there is else if (!conn->gctx && conn->gssencmode[0] == 'r') { appendPQExpBuffer(&conn->errorMessage, - libpq_gettext("GSSAPI encryption required, but was impossible (possibly no ccache, no server support, or using a local socket)\n")); + libpq_gettext("GSSAPI encryption required, but was impossible (possibly no credential cache, no server support, or using a local socket)\n")); goto error_return; } #endif diff --git a/src/interfaces/libpq/fe-gssapi-common.c b/src/interfaces/libpq/fe-gssapi-common.c index f3735df1bfa..3c230e47a84 100644 --- a/src/interfaces/libpq/fe-gssapi-common.c +++ b/src/interfaces/libpq/fe-gssapi-common.c @@ -58,7 +58,7 @@ pg_GSS_error(const char *mprefix, PGconn *conn, * Check if we can acquire credentials at all (and yield them if so). */ bool -pg_GSS_have_ccache(gss_cred_id_t *cred_out) +pg_GSS_have_cred_cache(gss_cred_id_t *cred_out) { OM_uint32 major, minor; diff --git a/src/interfaces/libpq/fe-gssapi-common.h b/src/interfaces/libpq/fe-gssapi-common.h index ebe24f7ca01..3c42b425365 100644 --- a/src/interfaces/libpq/fe-gssapi-common.h +++ b/src/interfaces/libpq/fe-gssapi-common.h @@ -20,7 +20,7 @@ void pg_GSS_error(const char *mprefix, PGconn *conn, OM_uint32 maj_stat, OM_uint32 min_stat); -bool pg_GSS_have_ccache(gss_cred_id_t *cred_out); +bool pg_GSS_have_cred_cache(gss_cred_id_t *cred_out); int pg_GSS_load_servicename(PGconn *conn); #endif |