mirror of
https://github.com/neovim/neovim.git
synced 2025-09-18 17:28:23 +00:00
cleanup: remove HAVE_SELINUX #10040
We never define HAVE_SELINUX, and no one has asked for it. So remove the dead code.
This commit is contained in:
@@ -29,8 +29,6 @@
|
|||||||
#cmakedefine HAVE_NL_MSG_CAT_CNTR
|
#cmakedefine HAVE_NL_MSG_CAT_CNTR
|
||||||
#cmakedefine HAVE_PWD_H
|
#cmakedefine HAVE_PWD_H
|
||||||
#cmakedefine HAVE_READLINK
|
#cmakedefine HAVE_READLINK
|
||||||
// TODO: add proper cmake check
|
|
||||||
// #define HAVE_SELINUX 1
|
|
||||||
#cmakedefine HAVE_SETPGID
|
#cmakedefine HAVE_SETPGID
|
||||||
#cmakedefine HAVE_SETSID
|
#cmakedefine HAVE_SETSID
|
||||||
#cmakedefine HAVE_SIGACTION
|
#cmakedefine HAVE_SIGACTION
|
||||||
|
@@ -2899,9 +2899,6 @@ buf_write (
|
|||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_ACL
|
#ifdef HAVE_ACL
|
||||||
mch_set_acl(backup, acl);
|
mch_set_acl(backup, acl);
|
||||||
#endif
|
|
||||||
#ifdef HAVE_SELINUX
|
|
||||||
mch_copy_sec(fname, backup);
|
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -3385,13 +3382,6 @@ restore_backup:
|
|||||||
end = 0;
|
end = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_SELINUX
|
|
||||||
// Probably need to set the security context.
|
|
||||||
if (!backup_copy) {
|
|
||||||
mch_copy_sec(backup, wfname);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef UNIX
|
#ifdef UNIX
|
||||||
// When creating a new file, set its owner/group to that of the original
|
// When creating a new file, set its owner/group to that of the original
|
||||||
// file. Get the new device and inode number.
|
// file. Get the new device and inode number.
|
||||||
@@ -4759,9 +4749,6 @@ int vim_rename(const char_u *from, const char_u *to)
|
|||||||
#ifdef HAVE_ACL
|
#ifdef HAVE_ACL
|
||||||
mch_set_acl(to, acl);
|
mch_set_acl(to, acl);
|
||||||
mch_free_acl(acl);
|
mch_free_acl(acl);
|
||||||
#endif
|
|
||||||
#ifdef HAVE_SELINUX
|
|
||||||
mch_copy_sec(from, to);
|
|
||||||
#endif
|
#endif
|
||||||
if (errmsg != NULL) {
|
if (errmsg != NULL) {
|
||||||
EMSG2(errmsg, to);
|
EMSG2(errmsg, to);
|
||||||
|
@@ -785,9 +785,6 @@ static bool mf_do_open(memfile_T *mfp, char_u *fname, int flags)
|
|||||||
}
|
}
|
||||||
|
|
||||||
(void)os_set_cloexec(mfp->mf_fd);
|
(void)os_set_cloexec(mfp->mf_fd);
|
||||||
#ifdef HAVE_SELINUX
|
|
||||||
mch_copy_sec(fname, mfp->mf_fname);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@@ -45,12 +45,6 @@
|
|||||||
#include "nvim/os/signal.h"
|
#include "nvim/os/signal.h"
|
||||||
#include "nvim/msgpack_rpc/helpers.h"
|
#include "nvim/msgpack_rpc/helpers.h"
|
||||||
|
|
||||||
#ifdef HAVE_SELINUX
|
|
||||||
# include <selinux/selinux.h>
|
|
||||||
static int selinux_enabled = -1;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef INCLUDE_GENERATED_DECLARATIONS
|
#ifdef INCLUDE_GENERATED_DECLARATIONS
|
||||||
# include "os_unix.c.generated.h"
|
# include "os_unix.c.generated.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -64,53 +58,6 @@ static int selinux_enabled = -1;
|
|||||||
# endif
|
# endif
|
||||||
|
|
||||||
|
|
||||||
#if defined(HAVE_SELINUX)
|
|
||||||
// Copy security info from "from_file" to "to_file".
|
|
||||||
void mch_copy_sec(char_u *from_file, char_u *to_file)
|
|
||||||
{
|
|
||||||
if (from_file == NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (selinux_enabled == -1)
|
|
||||||
selinux_enabled = is_selinux_enabled();
|
|
||||||
|
|
||||||
if (selinux_enabled > 0) {
|
|
||||||
security_context_t from_context = NULL;
|
|
||||||
security_context_t to_context = NULL;
|
|
||||||
|
|
||||||
if (getfilecon((char *)from_file, &from_context) < 0) {
|
|
||||||
// If the filesystem doesn't support extended attributes,
|
|
||||||
// the original had no special security context and the
|
|
||||||
// target cannot have one either.
|
|
||||||
if (errno == EOPNOTSUPP) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
MSG_PUTS(_("\nCould not get security context for "));
|
|
||||||
msg_outtrans(from_file);
|
|
||||||
msg_putchar('\n');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (getfilecon((char *)to_file, &to_context) < 0) {
|
|
||||||
MSG_PUTS(_("\nCould not get security context for "));
|
|
||||||
msg_outtrans(to_file);
|
|
||||||
msg_putchar('\n');
|
|
||||||
freecon (from_context);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (strcmp(from_context, to_context) != 0) {
|
|
||||||
if (setfilecon((char *)to_file, from_context) < 0) {
|
|
||||||
MSG_PUTS(_("\nCould not set security context for "));
|
|
||||||
msg_outtrans(to_file);
|
|
||||||
msg_putchar('\n');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
freecon(to_context);
|
|
||||||
freecon(from_context);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif // HAVE_SELINUX
|
|
||||||
|
|
||||||
// Return a pointer to the ACL of file "fname" in allocated memory.
|
// Return a pointer to the ACL of file "fname" in allocated memory.
|
||||||
// Return NULL if the ACL is not available for whatever reason.
|
// Return NULL if the ACL is not available for whatever reason.
|
||||||
vim_acl_T mch_get_acl(const char_u *fname)
|
vim_acl_T mch_get_acl(const char_u *fname)
|
||||||
|
@@ -1169,10 +1169,6 @@ void u_write_undo(const char *const name, const bool forceit, buf_T *const buf,
|
|||||||
&& os_fchown(fd, (uv_uid_t)-1, (uv_gid_t)file_info_old.stat.st_gid)) {
|
&& os_fchown(fd, (uv_uid_t)-1, (uv_gid_t)file_info_old.stat.st_gid)) {
|
||||||
os_setperm(file_name, (perm & 0707) | ((perm & 07) << 3));
|
os_setperm(file_name, (perm & 0707) | ((perm & 07) << 3));
|
||||||
}
|
}
|
||||||
# ifdef HAVE_SELINUX
|
|
||||||
if (buf->b_ffname != NULL)
|
|
||||||
mch_copy_sec(buf->b_ffname, file_name);
|
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
fp = fdopen(fd, "w");
|
fp = fdopen(fd, "w");
|
||||||
|
Reference in New Issue
Block a user