diff options
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/libpq/fe-auth.c | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 6 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-secure-gssapi.c | 12 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-int.h | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index 0dc31988b47..de0e13e50d1 100644 --- a/src/interfaces/libpq/fe-auth.c +++ b/src/interfaces/libpq/fe-auth.c @@ -97,7 +97,7 @@ pg_GSS_continue(PGconn *conn, int payloadlen) if (!pg_GSS_have_cred_cache(&conn->gcred)) conn->gcred = GSS_C_NO_CREDENTIAL; - if (conn->gssdeleg && pg_strcasecmp(conn->gssdeleg, "enable") == 0) + if (conn->gssdelegation && pg_strcasecmp(conn->gssdelegation, "enable") == 0) gss_flags |= GSS_C_DELEG_FLAG; maj_stat = gss_init_sec_context(&min_stat, diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 30486c59ba9..786d22a7706 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -343,9 +343,9 @@ static const internalPQconninfoOption PQconninfoOptions[] = { "GSS-library", "", 7, /* sizeof("gssapi") == 7 */ offsetof(struct pg_conn, gsslib)}, - {"gssdeleg", "PGGSSDELEG", NULL, NULL, + {"gssdelegation", "PGGSSDELEGATION", NULL, NULL, "GSS-delegation", "", 8, /* sizeof("disable") == 8 */ - offsetof(struct pg_conn, gssdeleg)}, + offsetof(struct pg_conn, gssdelegation)}, {"replication", NULL, NULL, NULL, "Replication", "D", 5, @@ -4453,7 +4453,7 @@ freePGconn(PGconn *conn) free(conn->gssencmode); free(conn->krbsrvname); free(conn->gsslib); - free(conn->gssdeleg); + free(conn->gssdelegation); free(conn->connip); /* Note that conn->Pfdebug is not ours to close or free */ free(conn->write_err_msg); diff --git a/src/interfaces/libpq/fe-secure-gssapi.c b/src/interfaces/libpq/fe-secure-gssapi.c index 3b2d0fd1401..c77d5cfe9f5 100644 --- a/src/interfaces/libpq/fe-secure-gssapi.c +++ b/src/interfaces/libpq/fe-secure-gssapi.c @@ -622,18 +622,18 @@ pqsecure_open_gss(PGconn *conn) if (ret != STATUS_OK) return PGRES_POLLING_FAILED; - if (conn->gssdeleg && pg_strcasecmp(conn->gssdeleg, "enable") == 0) + if (conn->gssdelegation && pg_strcasecmp(conn->gssdelegation, "enable") == 0) { /* Acquire credentials if possible */ if (conn->gcred == GSS_C_NO_CREDENTIAL) (void) pg_GSS_have_cred_cache(&conn->gcred); /* - * We have credentials and gssdeleg is enabled, so request credential - * delegation. This may or may not actually result in credentials - * being delegated- it depends on if the forwardable flag has been set - * in the credential and if the server is configured to accept - * delegated credentials. + * We have credentials and gssdelegation is enabled, so request + * credential delegation. This may or may not actually result in + * credentials being delegated- it depends on if the forwardable flag + * has been set in the credential and if the server is configured to + * accept delegated credentials. */ if (conn->gcred != GSS_C_NO_CREDENTIAL) gss_flags |= GSS_C_DELEG_FLAG; diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index e985b57cb5a..f1854f9919c 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -404,7 +404,7 @@ struct pg_conn char *krbsrvname; /* Kerberos service name */ char *gsslib; /* What GSS library to use ("gssapi" or * "sspi") */ - char *gssdeleg; /* Try to delegate GSS credentials? */ + char *gssdelegation; /* Try to delegate GSS credentials? */ char *ssl_min_protocol_version; /* minimum TLS protocol version */ char *ssl_max_protocol_version; /* maximum TLS protocol version */ char *target_session_attrs; /* desired session properties */ |