summaryrefslogtreecommitdiff
path: root/changelog.d
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2024-09-16 15:50:58 +0000
committerfeld <feld@feld.me>2024-09-16 15:50:58 +0000
commit3a0d4e98374d77fd6721034362677984b97d2cab (patch)
tree8d7c8721b6718185d8feff1fda1240f1001358e0 /changelog.d
parent8250a9764ea07a69a701401fd00f6d55e0ef2003 (diff)
parent91d1d7260b7084f59ae42e7c4b46c7fb963fda96 (diff)
downloadpleroma-3a0d4e98374d77fd6721034362677984b97d2cab.tar.gz
pleroma-3a0d4e98374d77fd6721034362677984b97d2cab.zip
Merge branch 'ldap-tls' into 'develop'
LDAP: permit overriding the CA root, improve SSL/TLS See merge request pleroma/pleroma!4265
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/ldap-ca.add1
-rw-r--r--changelog.d/ldaps.fix1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/ldap-ca.add b/changelog.d/ldap-ca.add
new file mode 100644
index 000000000..32ecbb5c0
--- /dev/null
+++ b/changelog.d/ldap-ca.add
@@ -0,0 +1 @@
+LDAP configuration now permits overriding the CA root certificate file for TLS validation.
diff --git a/changelog.d/ldaps.fix b/changelog.d/ldaps.fix
new file mode 100644
index 000000000..a1dc901ab
--- /dev/null
+++ b/changelog.d/ldaps.fix
@@ -0,0 +1 @@
+LDAPS connections (implicit TLS) are now supported.