Commit f65c70a1 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '5790-locking-fails-with-multiple-ssh-keys' into '1.3-dev'

Resolve "Locking fails with multiple SSH Keys"

See merge request fusiondirectory/fd!161
Showing with 2 additions and 2 deletions
+2 -2
......@@ -2329,9 +2329,9 @@ function lock_ssh_account($mode, array $attrs, &$modify)
$modify['sshPublicKey'] = array();
for ($i = 0; $i < $attrs['sshPublicKey']['count']; ++$i) {
if ($mode == 'LOCK') {
$modify['sshPublicKey'][] = preg_replace('/^/', 'disabled-', $attrs['sshPublicKey'][0]);
$modify['sshPublicKey'][] = preg_replace('/^/', 'disabled-', $attrs['sshPublicKey'][$i]);
} else {
$modify['sshPublicKey'][] = preg_replace('/^disabled-/', '', $attrs['sshPublicKey'][0]);
$modify['sshPublicKey'][] = preg_replace('/^disabled-/', '', $attrs['sshPublicKey'][$i]);
}
}
}
......
  • bmortier @bmortier

    mentioned in commit 2a2cdabf

    By Côme Chilliet on 2018-04-05T13:51:04 (imported from GitLab)

    ·

    mentioned in commit 2a2cdabf

    By Côme Chilliet on 2018-04-05T13:51:04 (imported from GitLab)

    Toggle commit list
  • bmortier @bmortier

    mentioned in merge request !204

    By Côme Chilliet on 2018-04-05T13:51:17 (imported from GitLab)

    ·

    mentioned in merge request !204

    By Côme Chilliet on 2018-04-05T13:51:17 (imported from GitLab)

    Toggle commit list
  • bmortier @bmortier

    mentioned in commit a5a6d410

    By Côme Chilliet on 2018-04-05T14:01:11 (imported from GitLab)

    ·

    mentioned in commit a5a6d410

    By Côme Chilliet on 2018-04-05T14:01:11 (imported from GitLab)

    Toggle commit list
  • bmortier @bmortier

    mentioned in commit e7a2669e

    By Côme Chilliet on 2020-06-11T13:54:10 (imported from GitLab)

    ·

    mentioned in commit e7a2669e

    By Côme Chilliet on 2020-06-11T13:54:10 (imported from GitLab)

    Toggle commit list
  • bmortier @bmortier

    mentioned in merge request !782

    By bmortier on 2020-06-11T13:54:38 (imported from GitLab)

    ·

    mentioned in merge request !782

    By bmortier on 2020-06-11T13:54:38 (imported from GitLab)

    Toggle commit list
  • bmortier @bmortier

    mentioned in commit b3e7eef4

    By bmortier on 2020-06-11T14:22:09 (imported from GitLab)

    ·

    mentioned in commit b3e7eef4

    By bmortier on 2020-06-11T14:22: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