Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit d57a931

Browse files
committed
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.
1 parent 7aa815a commit d57a931

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/interfaces/libpq/fe-connect.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2747,13 +2747,13 @@ PQconnectPoll(PGconn *conn)
27472747
#ifdef ENABLE_GSS
27482748

27492749
/*
2750-
* If GSSAPI is enabled and we have a ccache, try to set it up
2751-
* before sending startup messages. If it's already
2750+
* If GSSAPI is enabled and we have a credential cache, try to
2751+
* set it up before sending startup messages. If it's already
27522752
* operating, don't try SSL and instead just build the startup
27532753
* packet.
27542754
*/
27552755
if (conn->try_gss && !conn->gctx)
2756-
conn->try_gss = pg_GSS_have_ccache(&conn->gcred);
2756+
conn->try_gss = pg_GSS_have_cred_cache(&conn->gcred);
27572757
if (conn->try_gss && !conn->gctx)
27582758
{
27592759
ProtocolVersion pv = pg_hton32(NEGOTIATE_GSS_CODE);
@@ -2773,7 +2773,7 @@ PQconnectPoll(PGconn *conn)
27732773
else if (!conn->gctx && conn->gssencmode[0] == 'r')
27742774
{
27752775
appendPQExpBuffer(&conn->errorMessage,
2776-
libpq_gettext("GSSAPI encryption required, but was impossible (possibly no ccache, no server support, or using a local socket)\n"));
2776+
libpq_gettext("GSSAPI encryption required, but was impossible (possibly no credential cache, no server support, or using a local socket)\n"));
27772777
goto error_return;
27782778
}
27792779
#endif

src/interfaces/libpq/fe-gssapi-common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pg_GSS_error(const char *mprefix, PGconn *conn,
5858
* Check if we can acquire credentials at all (and yield them if so).
5959
*/
6060
bool
61-
pg_GSS_have_ccache(gss_cred_id_t *cred_out)
61+
pg_GSS_have_cred_cache(gss_cred_id_t *cred_out)
6262
{
6363
OM_uint32 major,
6464
minor;

src/interfaces/libpq/fe-gssapi-common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
void pg_GSS_error(const char *mprefix, PGconn *conn,
2222
OM_uint32 maj_stat, OM_uint32 min_stat);
23-
bool pg_GSS_have_ccache(gss_cred_id_t *cred_out);
23+
bool pg_GSS_have_cred_cache(gss_cred_id_t *cred_out);
2424
int pg_GSS_load_servicename(PGconn *conn);
2525

2626
#endif

0 commit comments

Comments
 (0)