From 09b6d37a045ef0af3743703db866c847808a50f7 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 9 Mar 2018 19:50:27 +0100 Subject: [PATCH] * ActiveDirectory: additional allow accountExpires=0 for never expires (beside attribute is not set or has value 9223372036854775807) --- api/src/Accounts/Ads.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/Accounts/Ads.php b/api/src/Accounts/Ads.php index cedd3fc2c7..640ea98e4d 100644 --- a/api/src/Accounts/Ads.php +++ b/api/src/Accounts/Ads.php @@ -494,7 +494,8 @@ class Ads 'account_fullname' => $data['displayname'][0], 'account_phone' => $data['telephonenumber'][0], 'account_status' => $data['useraccountcontrol'][0] & 2 ? false : 'A', - 'account_expires' => !isset($data['accountexpires']) || $data['accountexpires'][0] == self::EXPIRES_NEVER ? -1 : + 'account_expires' => !isset($data['accountexpires']) || !$data['accountexpires'][0] || + $data['accountexpires'][0] == self::EXPIRES_NEVER ? -1 : $this->adldap->utilities()->convertWindowsTimeToUnixTime($data['accountexpires'][0]), 'account_lastpwd_change' => !isset($data['pwdlastset']) ? null : (!$data['pwdlastset'][0] ? 0 : $this->adldap->utilities()->convertWindowsTimeToUnixTime($data['pwdlastset'][0])),