3 files changed, 10 insertions, 11 deletions
diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h
index c3f58ee1639..030921c254b 100644
--- a/src/include/libpq/crypt.h
+++ b/src/include/libpq/crypt.h
@@ -22,10 +22,6 @@ extern int	pwd_cache_count;
 extern char *crypt_getpwdfilename(void);
 extern char *crypt_getpwdreloadfilename(void);
 
-#ifdef NOT_USED
-extern MsgType crypt_salt(const char *user);
-
-#endif
-extern int	crypt_verify(const Port *port, const char *user, const char *pgpass);
+extern int md5_crypt_verify(const Port *port, const char *user, const char *pgpass);
 
 #endif
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index 0d792da3d35..11f052d3634 100644
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -4,7 +4,7 @@
  *	  Interface to hba.c
  *
  *
- * $Id: hba.h,v 1.22 2001/08/01 23:25:39 tgl Exp $
+ * $Id: hba.h,v 1.23 2001/08/15 18:42:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,9 @@ typedef enum UserAuth
 	uaTrust,
 	uaIdent,
 	uaPassword,
-	uaCrypt
+	uaCrypt,
+	uaMD5		/* 	This starts as uaCrypt from pg_hba.conf, but gets 
+					overridden if the client supports MD5 */
 } UserAuth;
 
 typedef struct Port hbaPort;
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 0f90ecdc67d..c709553f69b 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqcomm.h,v 1.55 2001/03/22 04:00:48 momjian Exp $
+ * $Id: pqcomm.h,v 1.56 2001/08/15 18:42:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -90,7 +90,7 @@ typedef union SockAddr
 /* The earliest and latest frontend/backend protocol version supported. */
 
 #define PG_PROTOCOL_EARLIEST	PG_PROTOCOL(0,0)
-#define PG_PROTOCOL_LATEST	PG_PROTOCOL(2,0)
+#define PG_PROTOCOL_LATEST	PG_PROTOCOL(2,1)
 
 /*
  * All packets sent to the postmaster start with the length.  This is omitted
@@ -127,11 +127,12 @@ typedef struct StartupPacket
 
 /* These are the authentication requests sent by the backend. */
 
-#define AUTH_REQ_OK		0		/* User is authenticated  */
+#define AUTH_REQ_OK			0	/* User is authenticated  */
 #define AUTH_REQ_KRB4		1	/* Kerberos V4 */
 #define AUTH_REQ_KRB5		2	/* Kerberos V5 */
 #define AUTH_REQ_PASSWORD	3	/* Password */
-#define AUTH_REQ_CRYPT		4	/* Encrypted password */
+#define AUTH_REQ_CRYPT		4	/* crypt password */
+#define AUTH_REQ_MD5		5	/* md5 password */
 
 typedef uint32 AuthRequest;