diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-08-09 05:05:54 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-08-09 15:11:30 +1000 |
| commit | 9ab5b9474779ac4f581d402ae397f871ed16b383 (patch) | |
| tree | 72369374530697b38743e4fa0e7648559d48c153 /readconf.c | |
| parent | 8fdbc7247f432578abaaca1b72a0dbf5058d67e5 (diff) | |
upstream: produce a useful error message if the user's shell is set
incorrectly during "match exec" processing. bz#2791 reported by Dario
Bertini; ok dtucker
OpenBSD-Commit-ID: cf9eddd6a6be726cb73bd9c3936f3888cd85c03d
Diffstat (limited to 'readconf.c')
| -rw-r--r-- | readconf.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.307 2019/06/28 13:35:04 deraadt Exp $ */ +/* $OpenBSD: readconf.c,v 1.308 2019/08/09 05:05:54 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -486,6 +486,11 @@ execute_in_shell(const char *cmd) if ((shell = getenv("SHELL")) == NULL) shell = _PATH_BSHELL; + if (access(shell, X_OK) == -1) { + fatal("Shell \"%s\" is not executable: %s", + shell, strerror(errno)); + } + /* Need this to redirect subprocess stdin/out */ if ((devnull = open(_PATH_DEVNULL, O_RDWR)) == -1) fatal("open(/dev/null): %s", strerror(errno)); |