From bf1e70f3554c2f591e15df7abca03138861e5c6c Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 27 Dec 2012 17:09:17 -0600 Subject: TOYBOX_DEBUG warns about lack of suid bit when running a STAYROOT command, but it shouldn't warn just because the multiplexer command "toybox" is stayroot. --- main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.c b/main.c index 0cd1cb23..bf89ef21 100644 --- a/main.c +++ b/main.c @@ -71,7 +71,8 @@ void toy_init(struct toy_list *which, char *argv[]) if (!(which->flags & TOYFLAG_STAYROOT)) { if (uid != euid) xsetuid(euid=uid); - } else if (CFG_TOYBOX_DEBUG && uid) error_msg("Not installed suid root"); + } else if (CFG_TOYBOX_DEBUG && uid && which != toy_list) + error_msg("Not installed suid root"); if ((which->flags & TOYFLAG_NEEDROOT) && euid) error_exit("Not root"); } -- cgit v1.2.3