5 files changed, 12 insertions, 12 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 6e5ddf53696..e108ef20c2b 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.157 2005/12/23 01:16:38 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.158 2005/12/26 14:58:04 petere Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -643,7 +643,7 @@ exec_command(const char *cmd,
 			else
 				user = PQuser(pset.db);
 
-			encrypted_password = pg_make_encrypted_password(pw1, user);
+			encrypted_password = PQencryptPassword(pw1, user);
 
 			if (!encrypted_password)
 			{
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index 9bd7d8d873c..03896583d3e 100644
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.25 2005/12/23 01:16:38 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.26 2005/12/26 14:58:05 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -251,7 +251,7 @@ main(int argc, char *argv[])
 		{
 			char	   *encrypted_password;
 
-			encrypted_password = pg_make_encrypted_password(newpassword,
+			encrypted_password = PQencryptPassword(newpassword,
 															newuser);
 			if (!encrypted_password)
 			{
diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt
index 3b95bccb467..9cf43cfc245 100644
--- a/src/interfaces/libpq/exports.txt
+++ b/src/interfaces/libpq/exports.txt
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/interfaces/libpq/exports.txt,v 1.6 2005/12/23 01:16:38 tgl Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/exports.txt,v 1.7 2005/12/26 14:58:05 petere Exp $
 # Functions to be exported by libpq DLLs
 PQconnectdb               1
 PQsetdbLogin              2
@@ -125,4 +125,4 @@ PQcancel                  122
 lo_create                 123
 PQinitSSL                 124
 PQregisterThreadLock      125
-pg_make_encrypted_password 126
+PQencryptPassword         126
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 039964a9fe5..2f80b43dbbd 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -10,7 +10,7 @@
  * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.109 2005/12/23 01:16:38 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.110 2005/12/26 14:58:05 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -534,7 +534,7 @@ pg_fe_getauthname(char *PQerrormsg)
 
 
 /*
- * pg_make_encrypted_password -- exported routine to encrypt a password
+ * PQencryptPassword -- exported routine to encrypt a password
  *
  * This is intended to be used by client applications that wish to send
  * commands like ALTER USER joe PASSWORD 'pwd'.  The password need not
@@ -548,11 +548,11 @@ pg_fe_getauthname(char *PQerrormsg)
  * is for.
  *
  * Return value is a malloc'd string, or NULL if out-of-memory.  The client
- * may assume the string doesn't contain any weird characters that would
+ * may assume the string doesn't contain any special characters that would
  * require escaping.
  */
 char *
-pg_make_encrypted_password(const char *passwd, const char *user)
+PQencryptPassword(const char *passwd, const char *user)
 {
 	char	   *crypt_pwd;
 
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index fc42c2b28a7..edb2ee38c75 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.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/interfaces/libpq/libpq-fe.h,v 1.123 2005/12/23 01:16:38 tgl Exp $
+ * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.124 2005/12/26 14:58:06 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -497,7 +497,7 @@ extern int	PQenv2encoding(void);
 
 /* === in fe-auth.c === */
 
-extern char *pg_make_encrypted_password(const char *passwd, const char *user);
+extern char *PQencryptPassword(const char *passwd, const char *user);
 
 #ifdef __cplusplus
 }