Reduce proc_exit(1) to proc_exit(0) for errors detected in backend

tglsfdc · tglsfdc · commit 4467194b4479 · 2000-02-20T04:26:35.000Z
command line processing.  As it stood, a bogus PGOPTIONS value from
a client would force a database system restart.  Not bad as a denial-
of-service attack...
diff --git 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.143 2000/02/19 22:10:47 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.144 2000/02/20 04:26:35 tgl Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1256,15 +1256,15 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 		(ShowParserStats || ShowPlannerStats || ShowExecutorStats))
 	{
 		fprintf(stderr, "-s can not be used together with -t.\n");
-		proc_exit(1);
+		proc_exit(0);
 	}
 
 	if (!DataDir)
 	{
 		fprintf(stderr, "%s does not know where to find the database system "
 				"data.  You must specify the directory that contains the "
 				"database system either by specifying the -D invocation "
-			 "option or by setting the PGDATA environment variable.\n\n",
+				"option or by setting the PGDATA environment variable.\n\n",
 				argv[0]);
 		proc_exit(1);
 	}
@@ -1324,7 +1324,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 		if (errs || argc != optind || DBName == NULL)
 		{
 			usage(argv[0]);
-			proc_exit(1);
+			proc_exit(0);
 		}
 		pq_init();				/* initialize libpq at backend startup */
 		whereToSendOutput = Remote;
@@ -1337,15 +1337,15 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 		if (errs || argc - optind > 1)
 		{
 			usage(argv[0]);
-			proc_exit(1);
+			proc_exit(0);
 		}
 		else if (argc - optind == 1)
 			DBName = argv[optind];
 		else if ((DBName = userName) == NULL)
 		{
 			fprintf(stderr, "%s: USER undefined and no database specified\n",
 					argv[0]);
-			proc_exit(1);
+			proc_exit(0);
 		}
 
 		/*
@@ -1503,14 +1503,14 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.143 $ $Date: 2000/02/19 22:10:47 $\n");
+		puts("$Revision: 1.144 $ $Date: 2000/02/20 04:26:35 $\n");
 	}
 
 	/*
 	 * Initialize the deferred trigger manager
 	 */
 	if (DeferredTriggerInit() != 0)
-		proc_exit(1);
+		proc_exit(0);
 
 	SetProcessingMode(NormalProcessing);
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.143 2000/02/19 22:10:47 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.144 2000/02/20 04:26:35 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -1256,15 +1256,15 @@ PostgresMain(int argc, char argv[], int real_argc, char real_argv[])`
`1256`	`1256`	`(ShowParserStats \|\| ShowPlannerStats \|\| ShowExecutorStats))`
`1257`	`1257`	`{`
`1258`	`1258`	`fprintf(stderr, "-s can not be used together with -t.\n");`
`1259`		`- proc_exit(1);`
	`1259`	`+ proc_exit(0);`
`1260`	`1260`	`}`
`1261`	`1261`
`1262`	`1262`	`if (!DataDir)`
`1263`	`1263`	`{`
`1264`	`1264`	`fprintf(stderr, "%s does not know where to find the database system "`
`1265`	`1265`	`"data. You must specify the directory that contains the "`
`1266`	`1266`	`"database system either by specifying the -D invocation "`
`1267`		`- "option or by setting the PGDATA environment variable.\n\n",`
	`1267`	`+ "option or by setting the PGDATA environment variable.\n\n",`
`1268`	`1268`	`argv[0]);`
`1269`	`1269`	`proc_exit(1);`
`1270`	`1270`	`}`
`@@ -1324,7 +1324,7 @@ PostgresMain(int argc, char argv[], int real_argc, char real_argv[])`
`1324`	`1324`	`if (errs \|\| argc != optind \|\| DBName == NULL)`
`1325`	`1325`	`{`
`1326`	`1326`	`usage(argv[0]);`
`1327`		`- proc_exit(1);`
	`1327`	`+ proc_exit(0);`
`1328`	`1328`	`}`
`1329`	`1329`	`pq_init(); /* initialize libpq at backend startup */`
`1330`	`1330`	`whereToSendOutput = Remote;`
`@@ -1337,15 +1337,15 @@ PostgresMain(int argc, char argv[], int real_argc, char real_argv[])`
`1337`	`1337`	`if (errs \|\| argc - optind > 1)`
`1338`	`1338`	`{`
`1339`	`1339`	`usage(argv[0]);`
`1340`		`- proc_exit(1);`
	`1340`	`+ proc_exit(0);`
`1341`	`1341`	`}`
`1342`	`1342`	`else if (argc - optind == 1)`
`1343`	`1343`	`DBName = argv[optind];`
`1344`	`1344`	`else if ((DBName = userName) == NULL)`
`1345`	`1345`	`{`
`1346`	`1346`	`fprintf(stderr, "%s: USER undefined and no database specified\n",`
`1347`	`1347`	`argv[0]);`
`1348`		`- proc_exit(1);`
	`1348`	`+ proc_exit(0);`
`1349`	`1349`	`}`
`1350`	`1350`
`1351`	`1351`	`/*`
`@@ -1503,14 +1503,14 @@ PostgresMain(int argc, char argv[], int real_argc, char real_argv[])`
`1503`	`1503`	`if (!IsUnderPostmaster)`
`1504`	`1504`	`{`
`1505`	`1505`	`puts("\nPOSTGRES backend interactive interface ");`
`1506`		`- puts("$Revision: 1.143 $ $Date: 2000/02/19 22:10:47 $\n");`
	`1506`	`+ puts("$Revision: 1.144 $ $Date: 2000/02/20 04:26:35 $\n");`
`1507`	`1507`	`}`
`1508`	`1508`
`1509`	`1509`	`/*`
`1510`	`1510`	`* Initialize the deferred trigger manager`
`1511`	`1511`	`*/`
`1512`	`1512`	`if (DeferredTriggerInit() != 0)`
`1513`		`- proc_exit(1);`
	`1513`	`+ proc_exit(0);`
`1514`	`1514`
`1515`	`1515`	`SetProcessingMode(NormalProcessing);`
`1516`	`1516`