3 files changed, 20 insertions, 26 deletions
diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h
index 95002d09773..642868f233d 100644
--- a/src/include/libpq/auth.h
+++ b/src/include/libpq/auth.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/libpq/auth.h,v 1.30 2005/10/15 02:49:44 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/libpq/auth.h,v 1.31 2005/10/17 16:24:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,18 +16,11 @@
 
 #include "libpq/libpq-be.h"
 
-/*----------------------------------------------------------------
- * Common routines and definitions
- *----------------------------------------------------------------
- */
-
-extern void ClientAuthentication(Port *port);
-
-#define PG_KRB5_VERSION "PGVER5.1"		/* at most KRB_SENDAUTH_VLEN chars */
-
 extern char *pg_krb_server_keyfile;
 extern char *pg_krb_srvnam;
 extern bool pg_krb_caseins_users;
 extern char *pg_krb_server_hostname;
 
+extern void ClientAuthentication(Port *port);
+
 #endif   /* AUTH_H */
diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h
index 440b2e034c7..aeb86b4c76d 100644
--- a/src/include/libpq/crypt.h
+++ b/src/include/libpq/crypt.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/libpq/crypt.h,v 1.31 2005/05/25 21:40:42 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/libpq/crypt.h,v 1.32 2005/10/17 16:24:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,12 +21,13 @@
 						 strlen(passwd) == MD5_PASSWD_LEN)
 
 
+/* in crypt.c */
 extern int md5_crypt_verify(const Port *port, const char *user,
 				 char *client_pass);
-extern bool md5_hash(const void *buff, size_t len, char *hexsum);
-extern bool CheckMD5Pwd(char *passwd, char *storedpwd, char *seed);
 
-extern bool EncryptMD5(const char *passwd, const char *salt,
+/* in md5.c --- these are also present in frontend libpq */
+extern bool pg_md5_hash(const void *buff, size_t len, char *hexsum);
+extern bool pg_md5_encrypt(const char *passwd, const char *salt,
 		   size_t salt_len, char *buf);
 
 #endif
diff --git a/src/include/libpq/ip.h b/src/include/libpq/ip.h
index c1013b574aa..57858934bd2 100644
--- a/src/include/libpq/ip.h
+++ b/src/include/libpq/ip.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2003-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/libpq/ip.h,v 1.14 2005/01/01 20:44:27 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/libpq/ip.h,v 1.15 2005/10/17 16:24:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,26 +16,26 @@
 #include "libpq/pqcomm.h"
 
 
-extern int getaddrinfo_all(const char *hostname, const char *servname,
-				const struct addrinfo * hintp,
-				struct addrinfo ** result);
-extern void freeaddrinfo_all(int hint_ai_family, struct addrinfo * ai);
+extern int pg_getaddrinfo_all(const char *hostname, const char *servname,
+				const struct addrinfo *hintp,
+				struct addrinfo **result);
+extern void pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo *ai);
 
-extern int getnameinfo_all(const struct sockaddr_storage * addr, int salen,
+extern int pg_getnameinfo_all(const struct sockaddr_storage *addr, int salen,
 				char *node, int nodelen,
 				char *service, int servicelen,
 				int flags);
 
-extern int rangeSockAddr(const struct sockaddr_storage * addr,
-			  const struct sockaddr_storage * netaddr,
-			  const struct sockaddr_storage * netmask);
+extern int pg_range_sockaddr(const struct sockaddr_storage *addr,
+			  const struct sockaddr_storage *netaddr,
+			  const struct sockaddr_storage *netmask);
 
-extern int SockAddr_cidr_mask(struct sockaddr_storage * mask,
+extern int pg_sockaddr_cidr_mask(struct sockaddr_storage *mask,
 				   char *numbits, int family);
 
 #ifdef HAVE_IPV6
-extern void promote_v4_to_v6_addr(struct sockaddr_storage * addr);
-extern void promote_v4_to_v6_mask(struct sockaddr_storage * addr);
+extern void pg_promote_v4_to_v6_addr(struct sockaddr_storage *addr);
+extern void pg_promote_v4_to_v6_mask(struct sockaddr_storage *addr);
 #endif
 
 #ifdef	HAVE_UNIX_SOCKETS