extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 03:41:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed setup-cmd-ldap copy2ad to fix samba-tool clasicupgrade wrong set never expiring accounts to correct value

Browse Source
This commit is contained in:
Ralf Becker 2013-07-09 13:47:47 +00:00
parent 71489f3eda
commit 809aa0c63c
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
setup/inc/class.setup_cmd_ldap.inc.php
View File

@ -343,20 +343,27 @@ class setup_cmd_ldap extends setup_cmd
} }
$dn = $dest[0]['dn']; $dn = $dest[0]['dn'];
if (isset($rename[''])) $entry[''] = ''; if (isset($rename[''])) $entry[''] = '';
// special handling for copying shadowExpires to accountExpires
if (strtolower($rename['shadowexpire']) === 'accountexpires')
{
// need to write accountExpires for never expiring account, as samba-tool classicupgrade sets it to 2038-01-19
if (!isset($entry['shadowexpire']) || !$entry['shadowexpire'])
{
$entry['shadowexpire'] = accounts_ads::EXPIRES_NEVER;
}
else
{
if (is_null($utc_diff)) $utc_diff = date('Z');
$entry['shadowexpire'] = $value*24*3600+$utc_diff; // ldap time to unixTime
$entry['shadowexpire'] = accounts_ads::convertUnixTimeToWindowsTime($entry['shadowexpire']);
}
}
$update = array(); $update = array();
foreach($entry as $attr => $value) foreach($entry as $attr => $value)
{ {
if ($value || $attr === '') if ($value || $attr === '')
{ {
$to = isset($rename[$attr]) ? $rename[$attr] : $attr; $to = isset($rename[$attr]) ? $rename[$attr] : $attr;
// special handling for copying shadowExpires to accountExpires (not set or 0 is handled by classicupgrade!)
if ($attr == 'shadowexpire' && strtolower($to) == 'accountexpires')
{
if (is_null($utc_diff)) $utc_diff = date('Z');
$value = $value*24*3600+$utc_diff; // ldap time to unixTime
$update['accountexpires'] = accounts_ads::convertUnixTimeToWindowsTime($value);
continue;
}
unset($prefix); unset($prefix);
if ($to[0] == '{') // eg. {smtp:}proxyAddresses=forwardTo if ($to[0] == '{') // eg. {smtp:}proxyAddresses=forwardTo
{ {