rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

> This change (I'm sure this will wrap poorly -- sorry): 

> http://developer.postgresql.org/cvsweb.cgi/pgsql-server/src/include/libpq/pqcomm.h.diff?r1=1.85&r2=1.86
>
> modified SockAddr, but no corresponding change was made here
> (fe-auth.c:612):
>
>   case AUTH_REQ_KRB5:
> #ifdef KRB5
>   if (pg_krb5_sendauth(PQerrormsg, conn->sock, &conn->laddr.in,
>                        &conn->raddr.in,
>                        hostname) != STATUS_OK)
>
> It's not obvious to me what the change ought to be though.

This patch should hopefully fix both kerberos 4 and 5.

Kurt Roeckx
This commit is contained in:
Bruce Momjian 2003-06-25 01:19:47 +00:00
parent afb17d912b
commit d9ddbdaa95
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/libpq/auth.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.102 2003/06/12 07:36:51 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.103 2003/06/25 01:19:47 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -430,6 +430,13 @@ ClientAuthentication(Port *port)
} }
case uaKrb4: case uaKrb4:
/* Kerberos 4 only seems to work with AF_INET. */
if (port->raddr.addr.ss_family != AF_INET
|| port->laddr.addr.ss_family != AF_INET)
{
elog(FATAL,
"Unsupported protocol for Kerberos 4");
}
sendAuthRequest(port, AUTH_REQ_KRB4); sendAuthRequest(port, AUTH_REQ_KRB4);
status = pg_krb4_recvauth(port); status = pg_krb4_recvauth(port);
break; break;

19
src/interfaces/libpq/fe-auth.c
View File

@ -10,7 +10,7 @@
* exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes). * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.80 2003/06/14 17:49:53 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.81 2003/06/25 01:19:47 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -357,10 +357,7 @@ pg_krb5_authname(char *PQerrormsg)
* the server * the server
*/ */
static int static int
pg_krb5_sendauth(char *PQerrormsg, int sock, pg_krb5_sendauth(char *PQerrormsg, int sock, const char *hostname)
struct sockaddr_in * laddr,
struct sockaddr_in * raddr,
const char *hostname)
{ {
krb5_error_code retval; krb5_error_code retval;
int ret; int ret;
@ -594,9 +591,10 @@ fe_sendauth(AuthRequest areq, PGconn *conn, const char *hostname,
case AUTH_REQ_KRB4: case AUTH_REQ_KRB4:
#ifdef KRB4 #ifdef KRB4
if (pg_krb4_sendauth(PQerrormsg, conn->sock, &conn->laddr.in, if (pg_krb4_sendauth(PQerrormsg, conn->sock,
&conn->raddr.in, (struct sockaddr_in *)&conn->laddr.addr,
hostname) != STATUS_OK) (struct sockaddr_in *)&conn->raddr.addr,
hostname) != STATUS_OK)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
libpq_gettext("Kerberos 4 authentication failed\n")); libpq_gettext("Kerberos 4 authentication failed\n"));
@ -611,9 +609,8 @@ fe_sendauth(AuthRequest areq, PGconn *conn, const char *hostname,
case AUTH_REQ_KRB5: case AUTH_REQ_KRB5:
#ifdef KRB5 #ifdef KRB5
if (pg_krb5_sendauth(PQerrormsg, conn->sock, &conn->laddr.in, if (pg_krb5_sendauth(PQerrormsg, conn->sock,
&conn->raddr.in, hostname) != STATUS_OK)
hostname) != STATUS_OK)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
libpq_gettext("Kerberos 5 authentication failed\n")); libpq_gettext("Kerberos 5 authentication failed\n"));