diff options
| author | Ermal Luçi <eri@pfsense.org> | 2009-05-08 19:20:28 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2009-05-08 19:20:28 +0000 |
| commit | 9befcca76aad3e31be525f64afbe47b5d59bafb2 (patch) | |
| tree | 01088c1bd0ab26aba780c802b729c83b4120bc8b | |
| parent | 0027de0a544438f146cfc94f005fd6f4ba9f94d7 (diff) | |
| download | pfsense-9befcca76aad3e31be525f64afbe47b5d59bafb2.zip pfsense-9befcca76aad3e31be525f64afbe47b5d59bafb2.tar.gz | |
Fix a lock leaking on CP.
| -rw-r--r-- | etc/inc/captiveportal.inc | 5 | ||||
| -rwxr-xr-x | usr/local/sbin/reset_slbd.sh | 12 |
2 files changed, 2 insertions, 15 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 751239c..411bdfc 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -902,9 +902,8 @@ function radius($username,$password,$clientip,$clientmac,$type) { $auth_list, $ruleno); } - else { - captiveportal_unlock(); - } + + captiveportal_unlock(); return $auth_list; diff --git a/usr/local/sbin/reset_slbd.sh b/usr/local/sbin/reset_slbd.sh deleted file mode 100755 index 72ad638..0000000 --- a/usr/local/sbin/reset_slbd.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -for items in `ps auxcwwl | awk '/slbd/{print $3}'|awk -F"." '{print $1}'` -do - if [ "$items" -gt "86" ]; then - killall slbd - sleep 2 - killall -9 slbd - echo "Resetting slbd due to high cpu usage: ${items}%" | logger - /usr/local/sbin/slbd -c/var/etc/slbd.conf -r5000 - fi -done |
