Skip to content
GitLab
Commit 9889f2a3 authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Fixes: #990 when the keyword is missing we get php errors in salspassword method

parent 4ae786f4
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1 fusiondirectory-1.0.20 fusiondirectory-1.0.19 fusiondirectory-1.0.18 fusiondirectory-1.0.17 fusiondirectory-1.0.16 fusiondirectory-1.0.15 fusiondirectory-1.0.14 fusiondirectory-1.0.13 fusiondirectory-1.0.12 fusiondirectory-1.0.11 fusiondirectory-1.0.10 fusiondirectory-1.0.9.3 fusiondirectory-1.0.9.2 fusiondirectory-1.0.9.1 fusiondirectory-1.0.9 fusiondirectory-1.0.8.9 fusiondirectory-1.0.8.8 fusiondirectory-1.0.8.7 fusiondirectory-1.0.8.6 fusiondirectory-1.0.8.5 fusiondirectory-1.0.8.4 fusiondirectory-1.0.8.3 fusiondirectory-1.0.8.2 fusiondirectory-1.0.8.1 fusiondirectory-1.0.8 fusiondirectory-1.0.7.5 fusiondirectory-1.0.7.4 fusiondirectory-1.0.7.3 fusiondirectory-1.0.7.2 fusiondirectory-1.0.7.1 fusiondirectory-1.0.7 fusiondirectory-1.0.6 fusiondirectory-1.0.5 fusiondirectory-1.0.4 fusiondirectory-1.0.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 3 deletions
+2 -3
include/password-methods/class_password-methods-sasl.inc
+ 2
− 3
View file @ 9889f2a3
...@@ -33,8 +33,7 @@ class passwordMethodsasl extends passwordMethod { ...@@ -33,8 +33,7 @@ class passwordMethodsasl extends passwordMethod {
$this->realm = trim($config->get_cfg_value('saslRealm',"")); $this->realm = trim($config->get_cfg_value('saslRealm',""));
$this->exop = trim($config->get_cfg_value('saslExop',"")); $this->exop = trim($config->get_cfg_value('saslExop',""));
if (empty($this->realm) && empty($this->exop)) { if (empty($this->realm) && empty($this->exop)) {
trigger_error(msgPool::cmdnotfound("saslRealm", _("SASL"))); msg_dialog::display(_("Error"), msgPool::cmdnotfound("saslRealm or saslExop", _("SASL")), ERROR_DIALOG);
trigger_error(msgPool::cmdnotfound("saslExop", _("SASL")));
} }
$attr = (empty($this->exop)?'uid':$this->exop); $attr = (empty($this->exop)?'uid':$this->exop);
...@@ -46,7 +45,7 @@ class passwordMethodsasl extends passwordMethod { ...@@ -46,7 +45,7 @@ class passwordMethodsasl extends passwordMethod {
$attrs = $ldap->fetch(); $attrs = $ldap->fetch();
$this->uid = $attrs[$attr][0]; $this->uid = $attrs[$attr][0];
} else { } else {
trigger_error("Cannot change password, unknown user '".$dn."'"); msg_dialog::display(_("Error"), sprintf(_("Cannot change password, unknown user '%s'"),$dn), ERROR_DIALOG);
} }
} }
......
  • bmortier @bmortier

    mentioned in issue #374 (closed)

    By bmortier on 2017-09-02T14:45:09 (imported from GitLab)

     ·

    mentioned in issue #374 (closed)

    By bmortier on 2017-09-02T14:45:09 (imported from GitLab)

    Toggle commit list
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment