diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-04-15 13:38:13 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-04-15 13:38:13 -0300 |
| commit | a51493d1981175048bdccce51f6b4ad6720da679 (patch) | |
| tree | 0c4afae78c022380e5f4cbb9397859761f46d708 /etc/inc/auth.inc | |
| parent | f599d893fff3d78f44068dc3ba238046d933ddb1 (diff) | |
| parent | 7b2fdeb3c5d4fecc23ce2f9a7e1fa1a4c3af63be (diff) | |
| download | pfsense-a51493d1981175048bdccce51f6b4ad6720da679.zip pfsense-a51493d1981175048bdccce51f6b4ad6720da679.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/gwlb.inc
Diffstat (limited to 'etc/inc/auth.inc')
| -rw-r--r-- | etc/inc/auth.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc index 8f1cde8..9d27da8 100644 --- a/etc/inc/auth.inc +++ b/etc/inc/auth.inc @@ -360,6 +360,8 @@ function local_user_set(& $user) { $user_shell = "/usr/local/bin/scponly"; } elseif (userHasPrivilege($user, "user-ssh-tunnel")) { $user_shell = "/usr/local/sbin/ssh_tunnel_shell"; + } elseif (userHasPrivilege($user, "user-ipsec-xauth-dialin")) { + $user_shell = "/sbin/nologin"; } else { $user_shell = "/sbin/nologin"; $lock_account = true; |
