Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 373766 Details for
Bug 482340
net-nds/phpldapadmin - broken with php-5.5
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
update patch to use pla prefix, include two more locations
file_482340.txt (text/plain), 4.85 KB, created by
Christohper Harrington
on 2014-03-28 18:51:25 UTC
(
hide
)
Description:
update patch to use pla prefix, include two more locations
Filename:
MIME Type:
Creator:
Christohper Harrington
Created:
2014-03-28 18:51:25 UTC
Size:
4.85 KB
patch
obsolete
>--- a/lib/functions.php >+++ b/lib/functions.php >@@ -2127,7 +2127,7 @@ > * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear. > * @return string The hashed password. > */ >-function password_hash($password_clear,$enc_type) { >+function pla_password_hash($password_clear,$enc_type) { > if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) > debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs); > >@@ -2318,7 +2318,7 @@ > > # SHA crypted passwords > case 'sha': >- if (strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0) >+ if (strcasecmp(pla_password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0) > return true; > else > return false; >@@ -2327,7 +2327,7 @@ > > # MD5 crypted passwords > case 'md5': >- if( strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0) >+ if( strcasecmp(pla_password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0) > return true; > else > return false; >@@ -2392,7 +2392,7 @@ > > # SHA512 crypted passwords > case 'sha512': >- if (strcasecmp(password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0) >+ if (strcasecmp(pla_password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0) > return true; > else > return false; >--- a/lib/TemplateRender.php >+++ b/lib/TemplateRender.php >@@ -2466,7 +2466,7 @@ > if ($val = $attribute->getValue($i)) > $default = get_enc_type($val); > else >- $default = $this->getServer()->getValue('appearance','password_hash'); >+ $default = $this->getServer()->getValue('appearance','pla_password_hash'); > > if (! $attribute->getPostValue()) > printf('<input type="hidden" name="post_value[%s][]" value="%s" />',$attribute->getName(),$i); >--- a/lib/PageRender.php >+++ b/lib/PageRender.php >@@ -287,7 +287,7 @@ > break; > > default: >- $vals[$i] = password_hash($passwordvalue,$enc); >+ $vals[$i] = pla_password_hash($passwordvalue,$enc); > } > > $vals = array_unique($vals); >@@ -957,7 +957,7 @@ > if (trim($val)) > $enc_type = get_enc_type($val); > else >- $enc_type = $server->getValue('appearance','password_hash'); >+ $enc_type = $server->getValue('appearance','pla_password_hash'); > > $obfuscate_password = obfuscate_password_display($enc_type); > >@@ -982,7 +982,7 @@ > if (trim($val)) > $enc_type = get_enc_type($val); > else >- $enc_type = $server->getValue('appearance','password_hash'); >+ $enc_type = $server->getValue('appearance','pla_password_hash'); > > echo '<table cellspacing="0" cellpadding="0"><tr><td valign="top">'; > >--- a/lib/ds_ldap_pla.php >+++ b/lib/ds_ldap_pla.php >@@ -16,7 +16,7 @@ > function __construct($index) { > parent::__construct($index); > >- $this->default->appearance['password_hash'] = array( >+ $this->default->appearance['pla_password_hash'] = array( > 'desc'=>'Default HASH to use for passwords', > 'default'=>'md5'); > >--- a/config/config.php >+++ b/config/config.php >@@ -379,7 +379,7 @@ > > /* Default password hashing algorithm. One of md5, ssha, sha, md5crpyt, smd5, > blowfish, crypt or leave blank for now default algorithm. */ >-// $servers->setValue('appearance','password_hash','md5'); >+// $servers->setValue('appearance','pla_password_hash','md5'); > > /* If you specified 'cookie' or 'session' as the auth_type above, you can > optionally specify here an attribute to use when logging in. If you enter >@@ -546,7 +546,7 @@ > $servers->setValue('sasl','authz_id_replacement','$1'); > $servers->setValue('sasl','props',null); > >-$servers->setValue('appearance','password_hash','md5'); >+$servers->setValue('appearance','pla_password_hash','md5'); > $servers->setValue('login','attr','dn'); > $servers->setValue('login','fallback_dn',false); > $servers->setValue('login','class',null);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 482340
:
357568
|
370938
|
370940
|
373756
|
373758
|
373760
|
373762
| 373766