diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 7d143a9590ae43f2e1e13fec0899bc38ae2d9c5a..9b1728a9dfe5b2e5aa683582e167b708044c7ae2 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.192 2000/11/29 20:59:52 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.193 2000/11/30 01:27:19 vadim Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1409,7 +1409,9 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
 						elog(ERROR, "-c %s requires argument", optarg);
 				}
 
-				SetConfigOption(name, value, PGC_BACKEND);
+				/* all options are allowed if not under postmaster */
+				SetConfigOption(name, value, 
+					(IsUnderPostmaster) ? PGC_BACKEND : PGC_POSTMASTER);
 				free(name);
 				if (value)
 					free(value);
@@ -1629,7 +1631,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.192 $ $Date: 2000/11/29 20:59:52 $\n");
+		puts("$Revision: 1.193 $ $Date: 2000/11/30 01:27:19 $\n");
 	}
 
 	/*