diff options
| author | Todd C. Miller <Todd.Miller@courtesan.com> | 2015-02-01 08:24:49 -0700 |
|---|---|---|
| committer | Todd C. Miller <Todd.Miller@courtesan.com> | 2015-02-01 08:24:49 -0700 |
| commit | 4891bf8836cdef8d483c8e0131ad3e517bb3208f (patch) | |
| tree | cb0e69acc0df4953c1db4c66c80904b02a00f79a /src/selinux.c | |
| parent | ba4590df51410d3bf1962679e510c609c8c1d8cd (diff) | |
| download | sudo-4891bf8836cdef8d483c8e0131ad3e517bb3208f.tar.gz | |
Go back to a 2 args debug_decl and just use the "default" instance,
now renamed "active".
Diffstat (limited to 'src/selinux.c')
| -rw-r--r-- | src/selinux.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/selinux.c b/src/selinux.c index bd3dab406..c459ccfa4 100644 --- a/src/selinux.c +++ b/src/selinux.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2014 Todd C. Miller <Todd.Miller@courtesan.com> + * Copyright (c) 2009-2015 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 2008 Dan Walsh <dwalsh@redhat.com> * * Borrowed heavily from newrole source code @@ -67,7 +67,7 @@ audit_role_change(const security_context_t old_context, { int au_fd, rc = -1; char *message; - debug_decl(audit_role_change, SUDO_DEBUG_SELINUX, sudo_debug_instance) + debug_decl(audit_role_change, SUDO_DEBUG_SELINUX) au_fd = audit_open(); if (au_fd == -1) { @@ -103,7 +103,7 @@ selinux_restore_tty(void) { int retval = 0; security_context_t chk_tty_context = NULL; - debug_decl(selinux_restore_tty, SUDO_DEBUG_SELINUX, sudo_debug_instance) + debug_decl(selinux_restore_tty, SUDO_DEBUG_SELINUX) if (se_state.ttyfd == -1 || se_state.new_tty_context == NULL) goto skip_relabel; @@ -148,7 +148,7 @@ relabel_tty(const char *ttyn, int ptyfd) security_context_t tty_con = NULL; security_context_t new_tty_con = NULL; int fd; - debug_decl(relabel_tty, SUDO_DEBUG_SELINUX, sudo_debug_instance) + debug_decl(relabel_tty, SUDO_DEBUG_SELINUX) se_state.ttyfd = ptyfd; @@ -245,7 +245,7 @@ get_exec_context(security_context_t old_context, const char *role, const char *t security_context_t new_context = NULL; context_t context = NULL; char *typebuf = NULL; - debug_decl(get_exec_context, SUDO_DEBUG_SELINUX, sudo_debug_instance) + debug_decl(get_exec_context, SUDO_DEBUG_SELINUX) /* We must have a role, the type is optional (we can use the default). */ if (!role) { @@ -317,7 +317,7 @@ selinux_setup(const char *role, const char *type, const char *ttyn, int ptyfd) { int rval = -1; - debug_decl(selinux_setup, SUDO_DEBUG_SELINUX, sudo_debug_instance) + debug_decl(selinux_setup, SUDO_DEBUG_SELINUX) /* Store the caller's SID in old_context. */ if (getprevcon(&se_state.old_context)) { @@ -373,7 +373,7 @@ selinux_execve(const char *path, char *const argv[], char *const envp[], char **nargv; const char *sesh; int argc, serrno; - debug_decl(selinux_execve, SUDO_DEBUG_SELINUX, sudo_debug_instance) + debug_decl(selinux_execve, SUDO_DEBUG_SELINUX) sesh = sudo_conf_sesh_path(); if (sesh == NULL) { |