summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xetc/rc2
-rwxr-xr-xetc/rc.expireaccounts (renamed from etc/rc.exipireaccounts)7
2 files changed, 5 insertions, 4 deletions
diff --git a/etc/rc b/etc/rc
index 642cc18..aef09c9 100755
--- a/etc/rc
+++ b/etc/rc
@@ -364,7 +364,7 @@ echo "done."
/usr/local/bin/minicron 240 /var/run/ping_hosts.pid /usr/local/bin/ping_hosts.sh
# Start account expire handler every hour
-/usr/local/bin/minicron 3600 /var/run/expire_accounts.pid /etc/rc.exipireaccounts
+/usr/local/bin/minicron 3600 /var/run/expire_accounts.pid /etc/rc.expireaccounts
# Start alias url updater every 24 hours
/usr/local/bin/minicron 86400 /var/run/update_alias_url_data.pid /etc/rc.update_alias_url_data
diff --git a/etc/rc.exipireaccounts b/etc/rc.expireaccounts
index 7aa9fe5..5058ac5 100755
--- a/etc/rc.exipireaccounts
+++ b/etc/rc.expireaccounts
@@ -40,7 +40,7 @@
$count = count($config['system']['user']);
$index = 0;
for(; $index < $count; $index++) {
- $user = $config['system']['user'][$index];
+ $user =& $config['system']['user'][$index];
if($user['scope'] == "system")
continue;
echo "1\n";
@@ -49,8 +49,9 @@
continue;
echo "1\n";
if(strtotime("-1 day") > strtotime($user['expires'])) {
- echo "removing user {$user['name']} at index #{$index}\n";
- unset($config['system']['user'][$index]);
+ echo "Disabling user {$user['name']} at index #{$index}\n";
+ //unset($config['system']['user'][$index]);
+ $user['disabled'] = true;
$removed++;
$count--;
$index--;
OpenPOWER on IntegriCloud