diff --git a/plist b/plist index f3f2828ad..87d7d84d8 100644 --- a/plist +++ b/plist @@ -91,7 +91,6 @@ /usr/local/etc/rc.d/configd /usr/local/etc/rc.d/flowd_aggregate /usr/local/etc/rc.d/netflow -/usr/local/etc/rc.expireaccounts /usr/local/etc/rc.filter_configure /usr/local/etc/rc.filter_synchronize /usr/local/etc/rc.firmware diff --git a/src/etc/inc/plugins.inc.d/core.inc b/src/etc/inc/plugins.inc.d/core.inc index 114c5cab9..40f5de07e 100644 --- a/src/etc/inc/plugins.inc.d/core.inc +++ b/src/etc/inc/plugins.inc.d/core.inc @@ -291,7 +291,6 @@ function core_cron() $jobs[]['autocron'] = array('/usr/local/sbin/configctl -d syslog archive', '1'); $jobs[]['autocron'] = array('/usr/local/sbin/expiretable -v -t 3600 sshlockout', '2'); $jobs[]['autocron'] = array('/usr/local/sbin/expiretable -v -t 3600 virusprot', '3'); - $jobs[]['autocron'] = array('/usr/local/etc/rc.expireaccounts', '4'); $jobs[]['autocron'] = array('/usr/local/sbin/ping_hosts.sh', '*/4'); $jobs[]['autocron'] = array('/usr/local/sbin/configctl -d firmware changelog cron', '0', '22'); diff --git a/src/etc/rc.expireaccounts b/src/etc/rc.expireaccounts deleted file mode 100755 index 0dca57835..000000000 --- a/src/etc/rc.expireaccounts +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/local/bin/php - - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -require_once 'config.inc'; -require_once 'auth.inc'; - -$a_users = &config_read_array('system', 'user'); - -$removed = 0; - -foreach ($a_users as &$user) { - if (empty($user['expires']) || isset($user['disabled'])) { - continue; - } - - echo "User {$user['name']} expires {$user['expires']}\n"; - - if (strtotime('-1 day') > strtotime($user['expires'])) { - echo "Disabling user '{$user['name']}'\n"; - $user['disabled'] = true; - $removed++; - } -} - -if ($removed > 0) { - write_config("Expired {$removed} user accounts"); - local_sync_accounts(); -}