extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-26 07:49:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update changepassword to work with LDAP

Browse Source
This commit is contained in:
jengo 2000-10-25 22:09:41 +00:00
parent 83b44eb542
commit cb30556aaf
2 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
admin/inc/accounts_ldap.inc.php
View File

@ -31,26 +31,6 @@
} }
return $searchline; return $searchline;
} }
function descryptpass($userpass, $random)
{
$lcrypt = "{crypt}";
$password = crypt($userpass);
$ldappassword = sprintf("%s%s", $lcrypt, $password);
return $ldappassword;
}
function md5cryptpass($userpass, $random)
{
$bsalt = "$1$";
$lcrypt = "{crypt}";
$modsalt = sprintf("%s%s", $bsalt, $random);
$password = crypt($userpass, $modsalt);
$ldappassword = sprintf("%s%s", $lcrypt, $password);
return $ldappassword;
}
// Not the best method, but it works for now. // Not the best method, but it works for now.
function account_total() function account_total()
@ -106,12 +86,12 @@
if ($phpgw_info["server"]["ldap_encryption_type"] == "DES") { if ($phpgw_info["server"]["ldap_encryption_type"] == "DES") {
$salt = $phpgw->common->randomstring(2); $salt = $phpgw->common->randomstring(2);
$account_info["passwd"] = descryptpass($account_info["passwd"], $salt); $account_info["passwd"] = $phpgw->common->des_cryptpasswd($account_info["passwd"], $salt);
} }
if ($phpgw_info["server"]["ldap_encryption_type"] == "MD5") { if ($phpgw_info["server"]["ldap_encryption_type"] == "MD5") {
$salt = $phpgw->common->randomstring(9); $salt = $phpgw->common->randomstring(9);
$account_info["passwd"] = md5cryptpass($account_info["passwd"], $salt); $account_info["passwd"] = $phpgw->common->md5_cryptpasswd($account_info["passwd"], $salt);
} }
// This method is only temp. We need to figure out the best way to assign uidnumbers and // This method is only temp. We need to figure out the best way to assign uidnumbers and

49
preferences/changepassword.php
View File

@ -52,11 +52,13 @@ if (! $submit) {
</table> </table>
</form> </form>
<br> <br>
<pre><?php echo lang("note: This feature does *not* change your email password. This will " <?php
. "need to be done manually."); ?> if ($phpgw_info["server"]["auth_type"] != "ldap") {
</pre> echo "<pre>" . lang("note: This feature does *not* change your email password. This will "
<?php . "need to be done manually.") . "</pre>";
$phpgw->common->phpgw_footer(); }
$phpgw->common->phpgw_footer();
} else { } else {
if ($n_passwd != $n_passwd_2) if ($n_passwd != $n_passwd_2)
$error = lang("the two passwords are not the same"); $error = lang("the two passwords are not the same");
@ -70,14 +72,41 @@ if (! $submit) {
exit; exit;
} }
$phpgw->db->query("update accounts set account_pwd='" . md5($n_passwd) . "', " if ($phpgw_info["server"]["auth_type"] == "sql") {
. "account_lastpwd_change='" . time() . "' where account_lid='" $phpgw->db->query("update accounts set account_pwd='" . md5($n_passwd) . "' "
. $phpgw_info["user"]["userid"] . "'"); . "where account_lid='" . $phpgw_info["user"]["userid"] . "'");
}
if ($phpgw_info["server"]["auth_type"] == "ldap") {
$ldap = ldap_connect($phpgw_info["server"]["ldap_host"]);
if (! @ldap_bind($ldap, $phpgw_info["server"]["ldap_root_dn"], $phpgw_info["server"]["ldap_root_pw"])) {
echo "<p><b>Error binding to LDAP server. Check your config</b>";
exit;
}
if ($phpgw_info["server"]["ldap_encryption_type"] == "DES") {
$salt = $phpgw->common->randomstring(2);
$n_passwd = $phpgw->common->des_cryptpasswd($n_passwd, $salt);
}
if ($phpgw_info["server"]["ldap_encryption_type"] == "MD5") {
$salt = $phpgw->common->randomstring(9);
$n_passwd = $phpgw->common->md5_cryptpasswd($n_passwd, $salt);
}
$entry["userpassword"] = $n_passwd;
$dn = sprintf("uid=%s, %s", $phpgw_info["user"]["userid"],$phpgw_info["server"]["ldap_context"]);
@ldap_modify($ldap, $dn, $entry);
}
// Since they are logged in, we need to change the password in sessions // Since they are logged in, we need to change the password in sessions
// in case they decied to check there mail. // in case they decied to check there mail.
$phpgw->db->query("update sessions set session_pwd='" . $phpgw->common->encrypt($n_passwd) $phpgw->db->query("update sessions set session_pwd='" . $phpgw->common->encrypt($n_passwd)
. "' where session_lid='" . $phpgw_info["user"]["userid"] . "'"); . "' where session_lid='" . $phpgw_info["user"]["userid"] . "'");
// Update there last password change
$phpgw->db->query("update accounts set account_lastpwd_change='" . time() . "' where account_id='"
. $phpgw_info["user"]["account_id"] . "'");
Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"]
. "/preferences/","cd=18")); . "/preferences/","cd=18"));