git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c

index 82b3cb2688368fdffa0d3a7bd46cc1f0d291d072..124a4586661e50f4bab48a477efabea377fe4414 100644 (file)

--- a/src/bin/pg_dump/dumputils.c

+++ b/src/bin/pg_dump/dumputils.c

* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.55 2010年02月26日 02:01:16 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.56 2010年03月03日 20:10:48 heikki Exp $

*

*-------------------------------------------------------------------------

*/

CONVERT_PRIV('C', "CREATE");

else if (strcmp(type, "FOREIGN DATA WRAPPER") == 0)

CONVERT_PRIV('U', "USAGE");

- else if (strcmp(type, "SERVER") == 0)

+ else if (strcmp(type, "FOREIGN SERVER") == 0)

CONVERT_PRIV('U', "USAGE");

else if (strcmp(type, "LARGE OBJECT") == 0)

{

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c

index 950f7ffdbda6daabc4e8facd762b0ef891d989e3..44bdddaf88d81c4f0a70afa834ee7ca6ef153978 100644 (file)

--- a/src/bin/pg_dump/pg_dump.c

+++ b/src/bin/pg_dump/pg_dump.c

* by PostgreSQL

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.575 2010年02月26日 02:01:16 momjian Exp $

+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.576 2010年03月03日 20:10:48 heikki Exp $

*

*-------------------------------------------------------------------------

*/

/* Handle the ACL */

namecopy = strdup(fmtId(srvinfo->dobj.name));

dumpACL(fout, srvinfo->dobj.catId, srvinfo->dobj.dumpId,

- "SERVER",

+ "FOREIGN SERVER",

namecopy, NULL, srvinfo->dobj.name,

NULL, srvinfo->rolname,

srvinfo->srvacl);