summaryrefslogtreecommitdiffstats
path: root/usr.sbin/adduser
diff options
context:
space:
mode:
authormtm <mtm@FreeBSD.org>2004-08-28 14:32:10 +0000
committermtm <mtm@FreeBSD.org>2004-08-28 14:32:10 +0000
commitd4a1defb3987ee2058cf2db8fae47ee3f74136cb (patch)
tree1620b597e4da422fee25b5aa1577c65f42a95eb3 /usr.sbin/adduser
parent044539800adf94b9334ee9189188caa2d2e28afa (diff)
downloadFreeBSD-src-d4a1defb3987ee2058cf2db8fae47ee3f74136cb.zip
FreeBSD-src-d4a1defb3987ee2058cf2db8fae47ee3f74136cb.tar.gz
Also, match the full path to the special nologin shell.
Previously, it would recognize it as a valid shell only if the basename (nologin) was specified. Now, it will recognize both the basename and the full path. NOTE: The full path as adduser(8) understands it is /usr/sbin/nologin. There is a symlink, /sbin/nologin, but that's deprecated and only there for backwards compatibility.
Diffstat (limited to 'usr.sbin/adduser')
-rw-r--r--usr.sbin/adduser/adduser.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh
index 7e21cb5..050f2b1 100644
--- a/usr.sbin/adduser/adduser.sh
+++ b/usr.sbin/adduser/adduser.sh
@@ -142,7 +142,8 @@ fullpath_from_shell() {
done
# /usr/sbin/nologin is a special case
- if [ "$_shell" = "${NOLOGIN}" ]; then
+ if [ "$_shell" = "${NOLOGIN}" -o \
+ "$_shell" = "${NOLOGIN_PATH}" ]; then
echo ${NOLOGIN_PATH}
return 0;
fi
OpenPOWER on IntegriCloud