88 *
99 *
1010 * IDENTIFICATION
11- * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.53 2001/06/20 18:07:55 petere Exp $
11+ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.54 2001/07/21 00:29:56 momjian Exp $
1212 *
1313 *-------------------------------------------------------------------------
1414 */
@@ -122,7 +122,6 @@ pg_krb4_recvauth(Port *port)
122122
123123return STATUS_ERROR ;
124124}
125-
126125#endif /* KRB4 */
127126
128127
@@ -304,7 +303,6 @@ pg_krb5_recvauth(Port *port)
304303
305304return STATUS_ERROR ;
306305}
307-
308306#endif /* KRB5 */
309307
310308
@@ -399,7 +397,6 @@ recv_and_check_passwordv0(Port *port)
399397 * Note that many sorts of failure report additional information in the
400398 * postmaster log, which we hope is only readable by good guys.
401399 */
402-
403400static void
404401auth_failed (Port * port )
405402{
@@ -435,7 +432,6 @@ auth_failed(Port *port)
435432}
436433
437434
438-
439435/*
440436 * Client authentication starts here. If there is an error, this
441437 * function does not return and the backend process is terminated.
@@ -451,7 +447,6 @@ ClientAuthentication(Port *port)
451447 * hba config file, not with the request. hba.c should have dropped
452448 * an error message into the postmaster logfile if it failed.
453449 */
454-
455450if (hba_getauthmethod (port )!= STATUS_OK )
456451elog (FATAL ,"Missing or erroneous pg_hba.conf file, see postmaster log for details" );
457452
@@ -464,26 +459,24 @@ ClientAuthentication(Port *port)
464459}
465460
466461/* Handle new style authentication. */
467-
468462switch (port -> auth_method )
469463{
470464case uaReject :
471-
472- /*
473- * This could have come from an explicit "reject" entry in
474- * pg_hba.conf, but more likely it means there was no
475- * matching entry.Take pity on the poor user and issue a
476- * helpful error message. NOTE: this is not a security
477- * breach, because all the info reported here is known at
478- * the frontend and must be assumed known to bad guys.
479- * We're merely helping out the less clueful good guys.
480- */
465+ /*
466+ * This could have come from an explicit "reject" entry in
467+ * pg_hba.conf, but more likely it means there was no
468+ * matching entry.Take pity on the poor user and issue a
469+ * helpful error message. NOTE: this is not a security
470+ * breach, because all the info reported here is known at
471+ * the frontend and must be assumed known to bad guys.
472+ * We're merely helping out the less clueful good guys.
473+ */
481474{
482475const char * hostinfo = "localhost" ;
483476
484477if (port -> raddr .sa .sa_family == AF_INET )
485478hostinfo = inet_ntoa (port -> raddr .in .sin_addr );
486- elog (FATAL ,
479+ elog (FATAL ,
487480"No pg_hba.conf entry for host %s, user %s, database %s" ,
488481hostinfo ,port -> user ,port -> database );
489482return ;
@@ -530,7 +523,6 @@ ClientAuthentication(Port *port)
530523/*
531524 * Send an authentication request packet to the frontend.
532525 */
533-
534526static void
535527sendAuthRequest (Port * port ,AuthRequest areq )
536528{
@@ -556,7 +548,6 @@ sendAuthRequest(Port *port, AuthRequest areq)
556548/*
557549 * Called when we have received the password packet.
558550 */
559-
560551static int
561552recv_and_check_password_packet (Port * port )
562553{
@@ -638,7 +629,6 @@ old_be_recvauth(Port *port)
638629 * allow the connection anyway, disallow it anyway, or use the result)
639630 * depending on what authentication we really want to use.
640631 */
641-
642632static int
643633map_old_to_new (Port * port ,UserAuth old ,int status )
644634{