77 *
88 *
99 * IDENTIFICATION
10- * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.35 1998/09/01 04:28:48 momjian Exp $
10+ * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.36 1998/10/02 16:18:20 momjian Exp $
1111 *
1212 *-------------------------------------------------------------------------
1313 */
@@ -565,6 +565,7 @@ ident(const struct in_addr remote_ip_addr, const struct in_addr local_ip_addr,
565565else
566566{
567567struct sockaddr_in ident_server ;
568+ struct sockaddr_in la ;
568569
569570/*
570571 * Socket address of Ident server on the system from which client
@@ -573,8 +574,22 @@ ident(const struct in_addr remote_ip_addr, const struct in_addr local_ip_addr,
573574ident_server .sin_family = AF_INET ;
574575ident_server .sin_port = htons (IDENT_PORT );
575576ident_server .sin_addr = remote_ip_addr ;
576- rc = connect (sock_fd ,
577- (struct sockaddr * )& ident_server ,sizeof (ident_server ));
577+
578+ /*
579+ * Bind to the address which the client originally contacted,
580+ * otherwise the ident server won't be able to match up the
581+ * right connection. This is necessary if the PostgreSQL
582+ * server is running on an IP alias.
583+ */
584+ memset (& la ,0 ,sizeof (la ));
585+ la .sin_family = AF_INET ;
586+ la .sin_addr = local_ip_addr ;
587+ rc = bind (sock_fd , (struct sockaddr * )& la ,sizeof (la ));
588+ if (rc == 0 )
589+ {
590+ rc = connect (sock_fd ,
591+ (struct sockaddr * )& ident_server ,sizeof (ident_server ));
592+ }
578593if (rc != 0 )
579594{
580595sprintf (PQerrormsg ,