Index: src/backend/tcop/postgres.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/backend/tcop/postgres.c,v
retrieving revision 1.567
diff -c -r1.567 postgres.c
*** src/backend/tcop/postgres.c	11 Jun 2009 14:49:02 -0000	1.567
--- src/backend/tcop/postgres.c	18 Jun 2009 08:45:45 -0000
***************
*** 2924,2931 ****
  	 *	If the databasename is omitted it is taken to be the user name.
  	 *
  	 *	When started from the postmaster, the format is
! 	 *		postgres [secure switches] -p databasename [insecure switches]
! 	 *	Switches appearing after -p came from the client (via "options"
  	 *	field of connection request).  For security reasons we restrict
  	 *	what these switches can do.
  	 * ----------------
--- 2924,2931 ----
  	 *	If the databasename is omitted it is taken to be the user name.
  	 *
  	 *	When started from the postmaster, the format is
! 	 *		postgres [secure switches] -y databasename [insecure switches]
! 	 *	Switches appearing after -y came from the client (via "options"
  	 *	field of connection request).  For security reasons we restrict
  	 *	what these switches can do.
  	 * ----------------
***************
*** 2938,2944 ****
  		argc--;
  	}
  
! 	/* all options are allowed until '-p' */
  	secure = true;
  	ctx = PGC_POSTMASTER;
  	gucsource = PGC_S_ARGV;		/* initial switches came from command line */
--- 2938,2944 ----
  		argc--;
  	}
  
! 	/* all options are allowed until '-y' */
  	secure = true;
  	ctx = PGC_POSTMASTER;
  	gucsource = PGC_S_ARGV;		/* initial switches came from command line */