diff options
| author | Pavan Deolasee | 2017-06-14 05:42:18 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2017-06-14 05:42:18 +0000 |
| commit | 15dd5274c323fb93e4e3ea9ad2185aaaec10f79c (patch) | |
| tree | 9dafb4c7f735d9429ea461dc792933af87493c33 /contrib/sepgsql/sepgsql.h | |
| parent | dfbb88e3bbb526dcb204b456b9e5cfd9d10d0d0a (diff) | |
| parent | d5cb3bab564e0927ffac7c8729eacf181a12dd40 (diff) | |
Merge from PG master upto d5cb3bab564e0927ffac7c8729eacf181a12dd40
This is the result of the "git merge remotes/PGSQL/master" upto the said commit
point. We have done some basic analysis, fixed compilation problems etc, but
bulk of the logical problems in conflict resolution etc will be handled by
subsequent commits.
Diffstat (limited to 'contrib/sepgsql/sepgsql.h')
| -rw-r--r-- | contrib/sepgsql/sepgsql.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/contrib/sepgsql/sepgsql.h b/contrib/sepgsql/sepgsql.h index c080716f8f..9d245c2780 100644 --- a/contrib/sepgsql/sepgsql.h +++ b/contrib/sepgsql/sepgsql.h @@ -4,7 +4,7 @@ * * Definitions corresponding to SE-PostgreSQL * - * Copyright (c) 2010-2016, PostgreSQL Global Development Group + * Copyright (c) 2010-2017, PostgreSQL Global Development Group * * ------------------------------------------------------------------------- */ @@ -276,12 +276,6 @@ extern char *sepgsql_get_label(Oid relOid, Oid objOid, int32 subId); extern void sepgsql_object_relabel(const ObjectAddress *object, const char *seclabel); -extern Datum sepgsql_getcon(PG_FUNCTION_ARGS); -extern Datum sepgsql_setcon(PG_FUNCTION_ARGS); -extern Datum sepgsql_mcstrans_in(PG_FUNCTION_ARGS); -extern Datum sepgsql_mcstrans_out(PG_FUNCTION_ARGS); -extern Datum sepgsql_restorecon(PG_FUNCTION_ARGS); - /* * dml.c */ |