diff --git a/doc/TODO b/doc/TODO
index df3cc16fae4ee371d4859e05d0e1ea4942f5ec58..2e85c94fe1d19a4341f08e104e6693d01b849328 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,6 +1,6 @@
 TODO list for PostgreSQL
 ========================
-Last updated:		Fri Dec 10 19:30:50 EST 1999
+Last updated:		Mon Dec 13 19:13:04 EST 1999
 
 Current maintainer:	Bruce Momjian (pgman@candle.pha.pa.us)
 
@@ -127,7 +127,7 @@ TYPES
 * -Add index on NUMERIC/DECIMAL type(Jan)
 * Make Absolutetime/Relativetime int4 because time_t can be int8 on some ports
 * Functions returning sets don't really work right[function]
-* Add max() for oid type
+* Make type equivalency apply to aggregates
 
 VIEWS
 
@@ -168,7 +168,7 @@ CLIENTS
 
 * Make NULL's come out at the beginning or end depending on the 
   ORDER BY direction
-* Allow flag to control COPY input/output of NULLs
+* -Allow flag to control COPY input/output of NULLs
 * Update reltuples from COPY command
 * -Allow psql \copy to allow delimiters
 * -Add a function to return the last inserted oid, for use in psql scripts
@@ -285,7 +285,7 @@ SOURCE CODE
 * -Make configure --enable-debug add -g on compile line
 * Does Mariposa source contain any other bug fixes?
 * Remove SET KSQO option if OR processing is improved(Tom)
-* rename 'createuser' to 'pg_createuser', and add 'pg_' to other commands
+
 ---------------------------------------------------------------------------
 
 
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 349a228872c42a685ad4d8fa277295bbf02268ca..de156171a5f9736bb07339d35fa0e9faac237cd8 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: user.c,v 1.43 1999/12/14 00:12:06 momjian Exp $
+ * $Id: user.c,v 1.44 1999/12/14 00:17:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,20 +44,12 @@ static void CheckPgUserAclNotNull(void);
  *---------------------------------------------------------------------
  */
 
-static void UpdatePgPwdFile(void);
+/* This is the old name. Now uses a lower case name to be able to call this
+   from SQL. */
+#define UpdatePgPwdFile() update_pg_pwd()
 
-/* This is a wrapper, so the below function can be called from a trigger
-   (used to update pg_pwd from pg_shadow) */
-HeapTuple update_pg_pwd()
-{
-    UpdatePgPwdFile();
-    return NULL;
-}
-
-
-
-static void
-UpdatePgPwdFile(void)
+void
+update_pg_pwd()
 {
 	char	   *filename,
 			   *tempname;