From 1c4dd05f407633b9d8ca156a7ee4984e1b131cf6 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Sat, 15 Aug 2020 23:11:09 -0400
Subject: Add 126 to hardcoded stop exits

> If a command is not found, the exit status shall be 127. If the
> command name is found, but it is not an executable utility, the exit
> status shall be 126. Applications that invoke utilities without using
> the shell should use these exit status values to report similar errors.

[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_08_02
---
 service.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'service.c')

diff --git a/service.c b/service.c
index e7cfe2f..63a647c 100644
--- a/service.c
+++ b/service.c
@@ -34,6 +34,11 @@
 
 #include "daemon.h"
 
+enum {
+	ExitNotFound = 127,
+	ExitNoExec   = 126,
+};
+
 const char *serviceDir = "/";
 uid_t serviceUID;
 gid_t serviceGID;
@@ -173,13 +178,13 @@ void serviceStart(struct Service *service) {
 	dup2(service->errPipe[1], STDERR_FILENO);
 
 	int error = chdir(serviceDir);
-	if (error) err(StopExit, "%s", serviceDir);
+	if (error) err(ExitNoExec, "%s", serviceDir);
 
 	error = setgid(serviceGID);
-	if (error) err(StopExit, "setgid");
+	if (error) err(ExitNoExec, "setgid");
 
 	error = setuid(serviceUID);
-	if (error) err(StopExit, "setuid");
+	if (error) err(ExitNoExec, "setuid");
 
 	size_t len = 0;
 	char command[ARG_MAX];
@@ -197,7 +202,7 @@ void serviceStart(struct Service *service) {
 		_PATH_BSHELL, "-c", command, service->name, NULL,
 		serviceEnviron
 	);
-	err(StopExit, "%s", _PATH_BSHELL);
+	err(ExitNotFound, "%s", _PATH_BSHELL);
 }
 
 void serviceSignal(struct Service *service, int signal) {
@@ -266,7 +271,11 @@ void serviceReap(pid_t pid, int status) {
 	service->state = Stop;
 	if (WIFEXITED(status)) {
 		int exit = WEXITSTATUS(status);
-		if (exit == StopExit || setTest(&stopExits, exit)) {
+		if (
+			exit == ExitNotFound ||
+			exit == ExitNoExec ||
+			setTest(&stopExits, exit)
+		) {
 			service->intent = Stop;
 		}
 		if (exit) {
-- 
cgit 1.4.1

n>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/libretls/log/?h=3.3.3p1&amp;id=1a24fe87cb1a9b55ae59734cd5eb31a71d58888d&amp;follow=1'>root</a>/<a href='/libretls/log/compat?h=3.3.3p1&amp;id=1a24fe87cb1a9b55ae59734cd5eb31a71d58888d&amp;follow=1'>compat</a>/<a href='/libretls/log/compat/arc4random_freebsd.h?h=3.3.3p1&amp;id=1a24fe87cb1a9b55ae59734cd5eb31a71d58888d&amp;follow=1'>arc4random_freebsd.h</a> (<a href='/libretls/log/compat/arc4random_freebsd.h?h=3.3.3p1&amp;id=1a24fe87cb1a9b55ae59734cd5eb31a71d58888d'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/libretls/log/compat/arc4random_freebsd.h?h=3.3.3p1&amp;id=1a24fe87cb1a9b55ae59734cd5eb31a71d58888d&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-08-02 15:42:48 -0400'>2020-08-02</span></td><td><a href='/libretls/commit/man/Makefile.am?h=3.3.3p1&amp;id=e5c08e2f0787eb1a1532ea3c0957892250007b07&amp;follow=1'>build: Strip down build</a></td><td>June McEnroed colspan='3' class='logmsg'>
These don't really go together, but...


</td></tr>
<tr class='logheader'><td><span title='2021-01-19 19:40:31 -0500'>2021-01-19</span></td><td class='logsubject'><a href='/src/commit/bin/make.l?id=5426534a897c735e3906788a94a5d61a3bd00701&amp;follow=1'>Match tab following escaped newline in make assignments</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Otherwise it ends up going into Shell state.


</td></tr>
<tr class='logheader'><td><span title='2021-01-18 21:33:21 -0500'>2021-01-18</span></td><td class='logsubject'><a href='/src/commit/bin/man1/hilex.1?id=6c4a03e8fb0d6df2e244177500f4820efc6f7876&amp;follow=1'>Allow matching lexers using first input line</a></td><td>June McEnroe