diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 056d3458381791a21aa27932a48bc24df838bd0d..bb18cad4affb8f31e4c98e65f1969bdc67c6c263 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.46 1999/12/20 01:11:37 tgl Exp $
+ * $Id: user.c,v 1.47 1999/12/21 22:39:01 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,7 @@
 #include "catalog/indexing.h"
 #include "commands/copy.h"
 #include "commands/user.h"
+#include "commands/trigger.h"
 #include "libpq/crypt.h"
 #include "miscadmin.h"
 #include "nodes/pg_list.h"
@@ -48,13 +49,20 @@ static void CheckPgUserAclNotNull(void);
  *---------------------------------------------------------------------
  */
 
-void
+HeapTuple
 update_pg_pwd(void)
 {
 	char	   *filename,
 			   *tempname;
 	int			bufsize;
 
+
+	/*
+	 * This is a trigger, so clean out the information provided by
+	 * the trigger manager.
+	 */
+	CurrentTriggerData = NULL;
+
 	/*
 	 * Create a temporary filename to be renamed later.  This prevents the
 	 * backend from clobbering the pg_pwd file while the postmaster might
@@ -93,6 +101,8 @@ update_pg_pwd(void)
 	creat(filename, S_IRUSR | S_IWUSR);
 
 	pfree((void *) tempname);
+
+	return NULL;
 }
 
 /*---------------------------------------------------------------------
diff --git a/src/include/commands/user.h b/src/include/commands/user.h
index 86a094b08592f749238ec6475354c538d2adee2c..036f1576820af7cec286e6bea2b429b758610fe2 100644
--- a/src/include/commands/user.h
+++ b/src/include/commands/user.h
@@ -21,6 +21,6 @@ extern void CreateGroup(CreateGroupStmt *stmt, CommandDest dest);
 extern void AlterGroup(AlterGroupStmt *stmt, CommandDest dest);
 extern void DropGroup(DropGroupStmt *stmt, CommandDest dest);
 
-extern void update_pg_pwd(void);
+extern HeapTuple update_pg_pwd(void);
 
 #endif	 /* USER_H */