diff options
| author | Jilles Tjoelker <jilles@FreeBSD.org> | 2019-02-08 23:03:28 +0000 |
|---|---|---|
| committer | Jilles Tjoelker <jilles@FreeBSD.org> | 2019-02-08 23:03:28 +0000 |
| commit | 3b08e0fcf357c1a905c5e59731930528fb94a0b1 (patch) | |
| tree | ce37ee903a5663ec898b5bfa7883d1cc8b3c6ef3 /sbin/dhclient/dhclient.c | |
| parent | 60c81cf10723ff1c793b5a94f6a7cad1e1a93199 (diff) | |
| download | src-3b08e0fcf357c1a905c5e59731930528fb94a0b1.tar.gz src-3b08e0fcf357c1a905c5e59731930528fb94a0b1.zip | |
dhclient: Return non-zero status when script exits due to a signal
r343896 made it such that a non-zero exit status was passed through, but was
still wrong if the script exits on a signal. POSIX does not say what the
WEXITSTATUS macro returns in this case and in practice 0 is a common value.
Instead, translate the wait status into 8 bits the same way as the shell
calculates $?.
Reviewed by: kib, Nash Kaminski
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=343922
Diffstat (limited to 'sbin/dhclient/dhclient.c')
| -rw-r--r-- | sbin/dhclient/dhclient.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index a6e0f2d169ce..c65ff81b5cfc 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -2348,7 +2348,8 @@ priv_script_go(void) if (ip) script_flush_env(ip->client); - return WEXITSTATUS(wstatus); + return (WIFEXITED(wstatus) ? + WEXITSTATUS(wstatus) : 128 + WTERMSIG(wstatus)); } void |