mirror of
https://github.com/postgres/postgres.git
synced 2025-06-11 20:28:21 +03:00
Fix compilation warnings with libselinux 3.1 in contrib/sepgsql/
Upstream SELinux has recently marked security_context_t as officially deprecated, causing warnings with -Wdeprecated-declarations. This is considered as legacy code for some time now by upstream as security_context_t got removed from most of the code tree during the development of 2.3 back in 2014. This removes all the references to security_context_t in sepgsql/ to be consistent with SELinux, fixing the warnings. Note that this does not impact the minimum version of libselinux supported. Reviewed-by: Tom Lane Discussion: https://postgr.es/m/20200813012735.GC11663@paquier.xyz
This commit is contained in:
@ -120,7 +120,7 @@ sepgsql_set_client_label(const char *new_label)
|
||||
tcontext = client_label_peer;
|
||||
else
|
||||
{
|
||||
if (security_check_context_raw((security_context_t) new_label) < 0)
|
||||
if (security_check_context_raw(new_label) < 0)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INVALID_NAME),
|
||||
errmsg("SELinux: invalid security label: \"%s\"",
|
||||
@ -453,9 +453,9 @@ sepgsql_get_label(Oid classId, Oid objectId, int32 subId)
|
||||
object.objectSubId = subId;
|
||||
|
||||
label = GetSecurityLabel(&object, SEPGSQL_LABEL_TAG);
|
||||
if (!label || security_check_context_raw((security_context_t) label))
|
||||
if (!label || security_check_context_raw(label))
|
||||
{
|
||||
security_context_t unlabeled;
|
||||
char *unlabeled;
|
||||
|
||||
if (security_get_initial_context_raw("unlabeled", &unlabeled) < 0)
|
||||
ereport(ERROR,
|
||||
@ -487,7 +487,7 @@ sepgsql_object_relabel(const ObjectAddress *object, const char *seclabel)
|
||||
* context of selinux.
|
||||
*/
|
||||
if (seclabel &&
|
||||
security_check_context_raw((security_context_t) seclabel) < 0)
|
||||
security_check_context_raw(seclabel) < 0)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INVALID_NAME),
|
||||
errmsg("SELinux: invalid security label: \"%s\"", seclabel)));
|
||||
@ -725,7 +725,7 @@ exec_object_restorecon(struct selabel_handle *sehnd, Oid catalogId)
|
||||
char *objname;
|
||||
int objtype = 1234;
|
||||
ObjectAddress object;
|
||||
security_context_t context;
|
||||
char *context;
|
||||
|
||||
/*
|
||||
* The way to determine object name depends on object classes. So, any
|
||||
|
Reference in New Issue
Block a user