diff options
| author | roam <roam@FreeBSD.org> | 2004-09-23 13:09:42 +0000 |
|---|---|---|
| committer | roam <roam@FreeBSD.org> | 2004-09-23 13:09:42 +0000 |
| commit | 6c3df7485a180bd5080920d02822833b5b1a389b (patch) | |
| tree | 4237b52c7f259a0b49295ef573150266dd97ecc7 /usr.sbin/adduser | |
| parent | 83e80bafbae946198508ae4d644be71d1f765b96 (diff) | |
| download | FreeBSD-src-6c3df7485a180bd5080920d02822833b5b1a389b.zip FreeBSD-src-6c3df7485a180bd5080920d02822833b5b1a389b.tar.gz | |
In fullpath_from_shell(), move the nologin detection before the cat | while
loop to avoid an incorrect display of the nologin path twice.
PR: 71786
Submitted by: Andrew Hayden <andrew.hayden@gmail.com>
Reviewed by: mtm
MFC after: 3 days
Diffstat (limited to 'usr.sbin/adduser')
| -rw-r--r-- | usr.sbin/adduser/adduser.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index 050f2b1..0014e4c 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -126,6 +126,17 @@ fullpath_from_shell() { _shell=$1 [ -z "$_shell" ] && return 1 + # /usr/sbin/nologin is a special case; it needs to be handled + # before the cat | while loop, since a 'return' from within + # a subshell will not terminate the function's execution, and + # the path to the nologin shell might be printed out twice. + # + if [ "$_shell" = "${NOLOGIN}" -o \ + "$_shell" = "${NOLOGIN_PATH}" ]; then + echo ${NOLOGIN_PATH} + return 0; + fi + cat ${ETCSHELLS} | while read _path _junk ; do case "$_path" in @@ -141,13 +152,6 @@ fullpath_from_shell() { esac done - # /usr/sbin/nologin is a special case - if [ "$_shell" = "${NOLOGIN}" -o \ - "$_shell" = "${NOLOGIN_PATH}" ]; then - echo ${NOLOGIN_PATH} - return 0; - fi - return 1 } |
