From 74e5f8bb544988b19d608f337ef665c71b52cac8 Mon Sep 17 00:00:00 2001 From: vda Date: Mon, 10 Sep 2007 17:17:01 +0000 Subject: [PATCH] run_shell: code shrink for selinux git-svn-id: svn://busybox.net/trunk/busybox@19814 69ca8d6d-28ef-0310-b511-8ec308f3f277 --- libbb/run_shell.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libbb/run_shell.c b/libbb/run_shell.c index 25d55dd6..b2b4216f 100644 --- a/libbb/run_shell.c +++ b/libbb/run_shell.c @@ -39,15 +39,13 @@ static security_context_t current_sid; void renew_current_security_context(void) { - if (current_sid) - freecon(current_sid); /* Release old context */ + freecon(current_sid); /* Release old context */ getcon(¤t_sid); /* update */ } void set_current_security_context(security_context_t sid) { - if (current_sid) - freecon(current_sid); /* Release old context */ + freecon(current_sid); /* Release old context */ current_sid = sid; } @@ -84,10 +82,10 @@ void run_shell(const char *shell, int loginshell, const char *command, const cha } args[argno] = NULL; #if ENABLE_SELINUX - if (current_sid && !setexeccon(current_sid)) { + if (current_sid) + setexeccon(current_sid); + if (ENABLE_FEATURE_CLEAN_UP) freecon(current_sid); - execve(shell, (char **) args, environ); - } else #endif execv(shell, (char **) args); bb_perror_msg_and_die("cannot run %s", shell); -- 2.17.1