summaryrefslogtreecommitdiffstats
path: root/etc/inc/auth.inc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2010-07-12 12:52:25 -0400
committerjim-p <jimp@pfsense.org>2010-07-12 12:52:25 -0400
commita137fedd7d1f2b63a5bed6627bd4b3e528d682c7 (patch)
treea80d208d398a3df4035b90e20808f938a3eda8be /etc/inc/auth.inc
parenta39675ecae28aa0e772eaae4ddb59dc3799b694e (diff)
downloadpfsense-a137fedd7d1f2b63a5bed6627bd4b3e528d682c7.zip
pfsense-a137fedd7d1f2b63a5bed6627bd4b3e528d682c7.tar.gz
Clean up this code.
Diffstat (limited to 'etc/inc/auth.inc')
-rw-r--r--etc/inc/auth.inc11
1 files changed, 5 insertions, 6 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index fed2a67..94179d5 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -286,13 +286,12 @@ function local_user_set(& $user) {
mkdir($home_base, 0755);
/* configure shell type */
- if (!(userHasPrivilege($user, "user-shell-access") || userHasPrivilege($user, "page-all"))) {
- if (!userHasPrivilege($user, "user-copy-files"))
- $user_shell = "/sbin/nologin";
- else
- $user_shell = "/usr/local/bin/scponly";
- } else {
+ if (userHasPrivilege($user, "user-shell-access") || userHasPrivilege($user, "page-all")) {
$user_shell = "/bin/tcsh";
+ } elseif (!userHasPrivilege($user, "user-copy-files")) {
+ $user_shell = "/sbin/nologin";
+ } else {
+ $user_shell = "/usr/local/bin/scponly";
}
/* root user special handling */
OpenPOWER on IntegriCloud