Fix incorrect tracking of session authorization in the presence of ACLs

tglsfdc · tglsfdc · commit 465edca3ecfb · 2004-07-19T21:02:17.000Z
that contain rights granted by non-owners.  Per bug report from
Nishad Prakash.
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.88 2004/07/13 03:00:17 momjian Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.89 2004/07/19 21:02:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2391,6 +2391,17 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isDat
 		_printTocHeader(AH, te, ropt, isData);
 	}
 
+	/*
+	 * If it's an ACL entry, it might contain SET SESSION AUTHORIZATION
+	 * commands, so we can no longer assume we know the current auth setting.
+	 */
+	if (strncmp(te->desc, "ACL", 3) == 0)
+	{
+		if (AH->currUser)
+			free(AH->currUser);
+		AH->currUser = NULL;
+	}
+
 	return 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.88 2004/07/13 03:00:17 momjian Exp $`
	`18`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.89 2004/07/19 21:02:17 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -2391,6 +2391,17 @@ _printTocEntry(ArchiveHandle AH, TocEntry te, RestoreOptions *ropt, bool isDat`
`2391`	`2391`	`_printTocHeader(AH, te, ropt, isData);`
`2392`	`2392`	`}`
`2393`	`2393`
	`2394`	`+ /*`
	`2395`	`+ * If it's an ACL entry, it might contain SET SESSION AUTHORIZATION`
	`2396`	`+ * commands, so we can no longer assume we know the current auth setting.`
	`2397`	`+ */`
	`2398`	`+ if (strncmp(te->desc, "ACL", 3) == 0)`
	`2399`	`+ {`
	`2400`	`+ if (AH->currUser)`
	`2401`	`+ free(AH->currUser);`
	`2402`	`+ AH->currUser = NULL;`
	`2403`	`+ }`
	`2404`	`+`
`2394`	`2405`	`return 1;`
`2395`	`2406`	`}`
`2396`	`2407`