mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

Removed depricated security_context_t

Browse Source 
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
This commit is contained in:
Radovan Sroka 2021-04-01 21:42:03 +02:00 committed by Todd C. Miller
parent 28d65159ed
commit c2a63690c8
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/selinux.c
View File

@ -58,10 +58,10 @@
#include "sudo_exec.h" #include "sudo_exec.h"
static struct selinux_state { static struct selinux_state {
security_context_t old_context; char * old_context;
security_context_t new_context; char * new_context;
security_context_t tty_con_raw; char * tty_con_raw;
security_context_t new_tty_con_raw; char * new_tty_con_raw;
const char *ttyn; const char *ttyn;
int ttyfd; int ttyfd;
int enforcing; int enforcing;
@ -69,8 +69,8 @@ static struct selinux_state {
#ifdef HAVE_LINUX_AUDIT #ifdef HAVE_LINUX_AUDIT
static int static int
audit_role_change(const security_context_t old_context, audit_role_change(const char * old_context,
const security_context_t new_context, const char *ttyn, int result) const char * new_context, const char *ttyn, int result)
{ {
int au_fd, rc = -1; int au_fd, rc = -1;
char *message; char *message;
@ -111,7 +111,7 @@ int
selinux_restore_tty(void) selinux_restore_tty(void)
{ {
int ret = -1; int ret = -1;
security_context_t chk_tty_con_raw = NULL; char * chk_tty_con_raw = NULL;
debug_decl(selinux_restore_tty, SUDO_DEBUG_SELINUX); debug_decl(selinux_restore_tty, SUDO_DEBUG_SELINUX);
if (se_state.ttyfd == -1 || se_state.new_tty_con_raw == NULL) { if (se_state.ttyfd == -1 || se_state.new_tty_con_raw == NULL) {
@ -166,8 +166,8 @@ skip_relabel:
static int static int
relabel_tty(const char *ttyn, int ptyfd) relabel_tty(const char *ttyn, int ptyfd)
{ {
security_context_t tty_con = NULL; char * tty_con = NULL;
security_context_t new_tty_con = NULL; char * new_tty_con = NULL;
struct stat sb; struct stat sb;
int fd; int fd;
debug_decl(relabel_tty, SUDO_DEBUG_SELINUX); debug_decl(relabel_tty, SUDO_DEBUG_SELINUX);
@ -308,10 +308,10 @@ bad:
* Returns a new security context based on the old context and the * Returns a new security context based on the old context and the
* specified role and type. * specified role and type.
*/ */
security_context_t char *
get_exec_context(security_context_t old_context, const char *role, const char *type) get_exec_context(char * old_context, const char *role, const char *type)
{ {
security_context_t new_context = NULL; char * new_context = NULL;
context_t context = NULL; context_t context = NULL;
char *typebuf = NULL; char *typebuf = NULL;
debug_decl(get_exec_context, SUDO_DEBUG_SELINUX); debug_decl(get_exec_context, SUDO_DEBUG_SELINUX);