From 54d7aa39dd54ceaf7b7e509b3792bace9f34bad0 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 21 Apr 2008 10:56:28 +0000 Subject: If we don't have permission to inspect the pidfile, don't report crashed. Gentoo #218028. --- src/rc/rc-status.c | 8 ++++++-- src/rc/runscript.c | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src/rc') diff --git a/src/rc/rc-status.c b/src/rc/rc-status.c index e4917c86..a64ab1b5 100644 --- a/src/rc/rc-status.c +++ b/src/rc/rc-status.c @@ -103,9 +103,13 @@ static void print_service(const char *service) snprintf(status, sizeof(status), "inactive "); color = ECOLOR_WARN; } else if (state & RC_SERVICE_STARTED) { - if (test_crashed && rc_service_daemons_crashed(service)) + errno = 0; + if (test_crashed && + rc_service_daemons_crashed(service) && + errno != EACCES) + { snprintf(status, sizeof(status), " crashed "); - else { + } else { snprintf(status, sizeof(status), " started "); color = ECOLOR_GOOD; } diff --git a/src/rc/runscript.c b/src/rc/runscript.c index 2f96d7ac..5977715a 100644 --- a/src/rc/runscript.c +++ b/src/rc/runscript.c @@ -559,8 +559,10 @@ static RC_SERVICE svc_status(void) snprintf(status, sizeof(status), "inactive"); e = &ewarn; } else if (state & RC_SERVICE_STARTED) { + errno = 0; if (_rc_can_find_pids() && - rc_service_daemons_crashed(service)) + rc_service_daemons_crashed(service) && + errno != EACCES) { snprintf(status, sizeof(status), "crashed"); e = &eerror; -- cgit v1.2.3