diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-10-09 23:04:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-10-09 23:04:47 +0200 |
| commit | 8956023920bb1b6f9c381739e59b9ddab4bf7798 (patch) | |
| tree | 8cf4f99d9f45903ea3f684c719577b26c22f6373 | |
| parent | e8211a33dcb0ac6e29aad6699160fdc2e5fa2024 (diff) | |
patch 8.2.1818: SE Linux: deprecation warning for security_context_tv8.2.1818
Problem: SE Linux: deprecation warning for security_context_t.
Solution: Use "char *" instead. (James McCoy, closes #7093)
| -rw-r--r-- | src/os_unix.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 2afe1ba936..40df6b727c 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -2832,8 +2832,10 @@ mch_copy_sec(char_u *from_file, char_u *to_file) if (selinux_enabled > 0) { - security_context_t from_context = NULL; - security_context_t to_context = NULL; + // Use "char *" instead of "security_context_t" to avoid a deprecation + // warning. + char *from_context = NULL; + char *to_context = NULL; if (getfilecon((char *)from_file, &from_context) < 0) { diff --git a/src/version.c b/src/version.c index 5adfd96786..5fdfeeaf4a 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1818, +/**/ 1817, /**/ 1816, |