From a8a4db55462c77f42afe3971932320e794cefa4a Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 13 Dec 2024 16:17:07 +0200
Subject: [PATCH] lib-sieve: storage: ldap: Rename tls to starttls
---
src/lib-sieve/storage/ldap/sieve-ldap-db.c | 10 +++++-----
.../storage/ldap/sieve-ldap-storage-settings.c | 4 ++--
.../storage/ldap/sieve-ldap-storage-settings.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-db.c b/src/lib-sieve/storage/ldap/sieve-ldap-db.c
index eb9e7feab..dbefce579 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-db.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-db.c
@@ -653,7 +653,7 @@ static int db_ldap_set_tls_options(struct ldap_connection *conn)
{
const struct sieve_ldap_settings *set = conn->lstorage->ldap_set;
- if (!set->tls)
+ if (!set->starttls)
return 0;
#ifdef OPENLDAP_TLS_OPTIONS
@@ -717,9 +717,9 @@ static int db_ldap_set_options(struct ldap_connection *conn)
"db: sasl_bind=yes requires ldap_version=3");
return -1;
}
- if (set->tls) {
+ if (set->starttls) {
e_error(storage->event,
- "db: tls=yes requires ldap_version=3");
+ "db: ldap_starttls=yes requires ldap_version=3");
return -1;
}
}
@@ -763,7 +763,7 @@ int sieve_ldap_db_connect(struct ldap_connection *conn)
return -1;
}
- if (set->tls) {
+ if (set->starttls) {
#ifdef LDAP_HAVE_START_TLS_S
ret = ldap_start_tls_s(conn->ld, NULL, NULL);
if (ret != LDAP_SUCCESS) {
@@ -771,7 +771,7 @@ int sieve_ldap_db_connect(struct ldap_connection *conn)
*set->uris != '\0' &&
str_begins_with(set->uris, "ldaps:")) {
e_error(storage->event, "db: "
- "Don't use both tls=yes and ldaps URI");
+ "Don't use both ldap_starttls=yes and ldaps URI");
}
e_error(storage->event, "db: "
"ldap_start_tls_s() failed: %s",
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c
index eb787f226..f2561f70d 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c
@@ -28,7 +28,7 @@ static const struct setting_define sieve_ldap_setting_defines[] = {
DEF(STR, uris),
DEF(STR, auth_dn),
DEF(STR, auth_dn_password),
- DEF(BOOL, tls),
+ DEF(BOOL, starttls),
DEF(BOOL, sasl_bind),
DEF(STR, sasl_mech),
DEF(STR, sasl_realm),
@@ -53,7 +53,7 @@ const struct sieve_ldap_settings sieve_ldap_default_settings = {
.uris = "",
.auth_dn = "",
.auth_dn_password = "",
- .tls = FALSE,
+ .starttls = FALSE,
.sasl_bind = FALSE,
.sasl_mech = "",
.sasl_realm = "",
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h
index 3220dbff4..de41f579c 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h
@@ -8,7 +8,7 @@ struct sieve_ldap_settings {
const char *auth_dn;
const char *auth_dn_password;
- bool tls;
+ bool starttls;
bool sasl_bind;
const char *sasl_mech;
const char *sasl_realm;
--
GitLab