diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 941d8ed119ce3df669de135cf080361cc76466a2..28793522c0860b24382b89b3ae440a2cb9b5019d 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.90 1998/06/27 04:53:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.91 1998/06/27 13:24:19 momjian Exp $
  *
  * NOTES
  *
@@ -1226,7 +1226,7 @@ DoBackend(Port *port)
 	 *	Let's clean up ourselves as the postmaster child
 	 */
 	
-	clear_proc_exit(); /* we don't want the postmaster's proc_exit() handlers */
+	on_exit_reset(); /* we don't want the postmaster's proc_exit() handlers */
 
 	/* ----------------
 	 *	register signal handlers.
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index e1ef1119efbf452da584d23cae24f17db1f94534..9037f6650996e7639feeb83a0ebe8b18304d44b2 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.27 1998/06/27 04:53:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.28 1998/06/27 13:24:20 momjian Exp $
  *
  * NOTES
  *
@@ -215,14 +215,15 @@ on_shmem_exit(void (*function) (), caddr_t arg)
 }
 
 /* ----------------------------------------------------------------
- *		clear_proc_exit
+ *		on_exit_reset
  *
  *		this function clears all proc_exit() registered functions.
  * ----------------------------------------------------------------
  */
 void
-clear_proc_exit(void)
+on_exit_reset(void)
 {
+	on_shmem_exit_index = 0;
 	on_proc_exit_index = 0;
 }
 
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index 778c54e2071ef808e8d40ba759535b12f674c8bd..c208122d8bae49332eedd5052c172854c1c00c45 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ipc.h,v 1.27 1998/06/27 04:53:49 momjian Exp $
+ * $Id: ipc.h,v 1.28 1998/06/27 13:24:21 momjian Exp $
  *
  * NOTES
  *	  This file is very architecture-specific.	This stuff should actually
@@ -75,7 +75,7 @@ extern void proc_exit(int code);
 extern void shmem_exit(int code);
 extern int on_shmem_exit(void (*function) (), caddr_t arg);
 extern int on_proc_exit(void (*function) (), caddr_t arg);
-extern void clear_proc_exit(void);
+extern void on_exit_reset(void);
 
 extern IpcSemaphoreId
 IpcSemaphoreCreate(IpcSemaphoreKey semKey,