Commit5599f40

committed

libpq: ccache -> credential cache

The term "ccache" is overloaded. Let's be more clear, in case someoneother than a Kerberos wizard has to read this code.

1 parent946647f commit5599f40Copy full SHA for 5599f40

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2748,13 +2748,13 @@ PQconnectPoll(PGconn *conn)`
`2748`	`2748`	`#ifdefENABLE_GSS`
`2749`	`2749`
`2750`	`2750`	`/*`
`2751`		`- * If GSSAPI is enabled and we have accache, try to set it up`
`2752`		`- * before sending startup messages. If it's already`
	`2751`	`+ * If GSSAPI is enabled and we have acredential cache, try to`
	`2752`	`+ *set it upbefore sending startup messages. If it's already`
`2753`	`2753`	`* operating, don't try SSL and instead just build the startup`
`2754`	`2754`	`* packet.`
`2755`	`2755`	`*/`
`2756`	`2756`	`if (conn->try_gss&& !conn->gctx)`
`2757`		`-conn->try_gss=pg_GSS_have_ccache(&conn->gcred);`
	`2757`	`+conn->try_gss=pg_GSS_have_cred_cache(&conn->gcred);`
`2758`	`2758`	`if (conn->try_gss&& !conn->gctx)`
`2759`	`2759`	`{`
`2760`	`2760`	`ProtocolVersionpv=pg_hton32(NEGOTIATE_GSS_CODE);`
`@@ -2774,7 +2774,7 @@ PQconnectPoll(PGconn *conn)`
`2774`	`2774`	`elseif (!conn->gctx&&conn->gssencmode[0]=='r')`
`2775`	`2775`	`{`
`2776`	`2776`	`appendPQExpBufferStr(&conn->errorMessage,`
`2777`		`-libpq_gettext("GSSAPI encryption required, but was impossible (possibly noccache, no server support, or using a local socket)\n"));`
	`2777`	`+libpq_gettext("GSSAPI encryption required, but was impossible (possibly nocredential cache, no server support, or using a local socket)\n"));`
`2778`	`2778`	`gotoerror_return;`
`2779`	`2779`	`}`
`2780`	`2780`	`#endif`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ pg_GSS_error(const char mprefix, PGconn conn,`
`58`	`58`	`* Check if we can acquire credentials at all (and yield them if so).`
`59`	`59`	`*/`
`60`	`60`	`bool`
`61`		`-pg_GSS_have_ccache(gss_cred_id_t*cred_out)`
	`61`	`+pg_GSS_have_cred_cache(gss_cred_id_t*cred_out)`
`62`	`62`	`{`
`63`	`63`	`OM_uint32major,`
`64`	`64`	`minor;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`voidpg_GSS_error(constcharmprefix,PGconnconn,`
`22`	`22`	`OM_uint32maj_stat,OM_uint32min_stat);`
`23`		`-boolpg_GSS_have_ccache(gss_cred_id_t*cred_out);`
	`23`	`+boolpg_GSS_have_cred_cache(gss_cred_id_t*cred_out);`
`24`	`24`	`intpg_GSS_load_servicename(PGconn*conn);`
`25`	`25`
`26`	`26`	`#endif`

Comments

(0)