holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

historically crypt is called des in ldap

Browse Source
This commit is contained in:
Ralf Becker 2011-05-04 20:19:59 +00:00
parent e0614a8a6a
commit 99910cd62e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup/inc/hook_config.inc.php
View File

@ -151,7 +151,7 @@ function passwdhashes($config,$return_hashes=false)
'ssha' => 'ssha'.' ('.lang('default').')',
'smd5' => 'smd5',
'sha' => 'sha',
'des' => 'des',
'des' => 'des', // historically crypt is called des in ldap
);
/* Check for available crypt methods based on what is defined by php */
if(@defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
@ -166,17 +166,13 @@ function passwdhashes($config,$return_hashes=false)
{
$hashes['ext_crypt'] = 'ext_crypt';
}
if(@defined('CRYPT_STD_DES') && CRYPT_STD_DES == 1)
{
$hashes['crypt'] = 'crypt';
}
$hashes += array(
'md5' => 'md5',
'plain' => 'plain',
);
return $return_hashes ? $hashes : _options_from($hashes, $config['ldap_encryption_type'] ? $config['ldap_encryption_type'] : 'crypt');
return $return_hashes ? $hashes : _options_from($hashes, $config['ldap_encryption_type'] ? $config['ldap_encryption_type'] : 'des');
}
function sql_passwdhashes($config,$return_hashes=false)