diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2002-02-23 04:17:47 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2002-02-23 04:17:47 +0000 |
| commit | 42c3381fc7d90d196a19118e707705ce9a40f8af (patch) | |
| tree | 5bfb3c40d900e319cba6128c864e1796783e685a /src/backend/libpq/auth.c | |
| parent | 0055a3939048c8b7190f1a993a9a364657fe90e7 (diff) | |
| download | postgresql-42c3381fc7d90d196a19118e707705ce9a40f8af.tar.gz postgresql-42c3381fc7d90d196a19118e707705ce9a40f8af.zip | |
Heimdal support (Kerberos V implementation from KTH)
Diffstat (limited to 'src/backend/libpq/auth.c')
| -rw-r--r-- | src/backend/libpq/auth.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index e3dd02cb489..fc2ec1c72f1 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.73 2002/02/19 19:49:09 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.74 2002/02/23 04:17:46 petere Exp $ * *------------------------------------------------------------------------- */ @@ -229,7 +229,7 @@ pg_krb5_init(void) " Kerberos error %d\n", retval); com_err("postgres", retval, "while getting server principal for service %s", - pg_krb_server_keyfile); + PG_KRB_SRVNAM); krb5_kt_close(pg_krb5_context, pg_krb5_keytab); krb5_free_context(pg_krb5_context); return STATUS_ERROR; @@ -283,8 +283,15 @@ pg_krb5_recvauth(Port *port) * * I have no idea why this is considered necessary. */ +#if defined(HAVE_KRB5_TICKET_ENC_PART2) retval = krb5_unparse_name(pg_krb5_context, ticket->enc_part2->client, &kusername); +#elif defined(HAVE_KRB5_TICKET_CLIENT) + retval = krb5_unparse_name(pg_krb5_context, + ticket->client, &kusername); +#else +#error "bogus configuration" +#endif if (retval) { snprintf(PQerrormsg, PQERRORMSG_LENGTH, |