Index: src/backend/utils/misc/guc.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/backend/utils/misc/guc.c,v
retrieving revision 1.151
diff -c -c -r1.151 guc.c
*** src/backend/utils/misc/guc.c	26 Aug 2003 15:38:25 -0000	1.151
--- src/backend/utils/misc/guc.c	31 Aug 2003 04:41:15 -0000
***************
*** 2556,2562 ****
  					/* Limit non-superuser changes */
  					if (record->context == PGC_USERLIMIT &&
  						source > PGC_S_UNPRIVILEGED &&
! 						newval < conf->session_val &&
  						!superuser())
  					{
  						ereport(elevel,
--- 2556,2562 ----
  					/* Limit non-superuser changes */
  					if (record->context == PGC_USERLIMIT &&
  						source > PGC_S_UNPRIVILEGED &&
! 						newval < conf->reset_val &&
  						!superuser())
  					{
  						ereport(elevel,
***************
*** 2569,2576 ****
  					/* Allow admin to override non-superuser setting */
  					if (record->context == PGC_USERLIMIT &&
  						source < PGC_S_UNPRIVILEGED &&
! 						record->session_source > PGC_S_UNPRIVILEGED &&
! 						newval > conf->session_val &&
  						!superuser())
  						DoIt = DoIt_orig;
  				}
--- 2569,2576 ----
  					/* Allow admin to override non-superuser setting */
  					if (record->context == PGC_USERLIMIT &&
  						source < PGC_S_UNPRIVILEGED &&
! 						record->reset_source > PGC_S_UNPRIVILEGED &&
! 						newval > conf->reset_val &&
  						!superuser())
  						DoIt = DoIt_orig;
  				}
***************
*** 2652,2659 ****
  					/* Limit non-superuser changes */
  					if (record->context == PGC_USERLIMIT &&
  						source > PGC_S_UNPRIVILEGED &&
! 						conf->session_val != 0 &&
! 						(newval > conf->session_val || newval == 0) &&
  						!superuser())
  					{
  						ereport(elevel,
--- 2652,2659 ----
  					/* Limit non-superuser changes */
  					if (record->context == PGC_USERLIMIT &&
  						source > PGC_S_UNPRIVILEGED &&
! 						conf->reset_val != 0 &&
! 						(newval > conf->reset_val || newval == 0) &&
  						!superuser())
  					{
  						ereport(elevel,
***************
*** 2666,2673 ****
  					/* Allow admin to override non-superuser setting */
  					if (record->context == PGC_USERLIMIT &&
  						source < PGC_S_UNPRIVILEGED &&
! 						record->session_source > PGC_S_UNPRIVILEGED &&
! 						newval < conf->session_val &&
  						!superuser())
  						DoIt = DoIt_orig;
  				}
--- 2666,2673 ----
  					/* Allow admin to override non-superuser setting */
  					if (record->context == PGC_USERLIMIT &&
  						source < PGC_S_UNPRIVILEGED &&
! 						record->reset_source > PGC_S_UNPRIVILEGED &&
! 						newval < conf->reset_val &&
  						!superuser())
  						DoIt = DoIt_orig;
  				}
***************
*** 2749,2755 ****
  					/* Limit non-superuser changes */
  					if (record->context == PGC_USERLIMIT &&
  						source > PGC_S_UNPRIVILEGED &&
! 						newval > conf->session_val &&
  						!superuser())
  					{
  						ereport(elevel,
--- 2749,2755 ----
  					/* Limit non-superuser changes */
  					if (record->context == PGC_USERLIMIT &&
  						source > PGC_S_UNPRIVILEGED &&
! 						newval > conf->reset_val &&
  						!superuser())
  					{
  						ereport(elevel,
***************
*** 2762,2769 ****
  					/* Allow admin to override non-superuser setting */
  					if (record->context == PGC_USERLIMIT &&
  						source < PGC_S_UNPRIVILEGED &&
! 						record->session_source > PGC_S_UNPRIVILEGED &&
! 						newval < conf->session_val &&
  						!superuser())
  						DoIt = DoIt_orig;
  				}
--- 2762,2769 ----
  					/* Allow admin to override non-superuser setting */
  					if (record->context == PGC_USERLIMIT &&
  						source < PGC_S_UNPRIVILEGED &&
! 						record->reset_source > PGC_S_UNPRIVILEGED &&
! 						newval < conf->reset_val &&
  						!superuser())
  						DoIt = DoIt_orig;
  				}
***************
*** 2860,2867 ****
  						}
  						/* Allow admin to override non-superuser setting */
  						if (source < PGC_S_UNPRIVILEGED &&
! 							record->session_source > PGC_S_UNPRIVILEGED &&
! 							newval < conf->session_val &&
  							!superuser())
  							DoIt = DoIt_orig;
  					}
--- 2860,2867 ----
  						}
  						/* Allow admin to override non-superuser setting */
  						if (source < PGC_S_UNPRIVILEGED &&
! 							record->reset_source > PGC_S_UNPRIVILEGED &&
! 							newval < conf->reset_val &&
  							!superuser())
  							DoIt = DoIt_orig;
  					}