lib-sieve: storage: ldap: sieve-ldap-storage-settings - Rename parsed settings struct fields

src/lib-sieve/storage/ldap/sieve-ldap-db.c

@@ -676,7 +676,7 @@ static int db_ldap_set_tls_options(struct ldap_connection *conn)
 		return -1;
 	if (set->tls_require_cert != NULL) {
 		if (db_ldap_set_opt(conn, LDAP_OPT_X_TLS_REQUIRE_CERT,
-				    &set->ldap_tls_require_cert,
+				    &set->parsed.tls_require_cert,
 				    "tls_require_cert",
 				    set->tls_require_cert) < 0)
 			return -1;
@@ -702,7 +702,7 @@ static int db_ldap_set_options(struct ldap_connection *conn)
 	unsigned int ldap_version;
 	int value;
 
-	if (db_ldap_set_opt(conn, LDAP_OPT_DEREF, &set->ldap_deref,
+	if (db_ldap_set_opt(conn, LDAP_OPT_DEREF, &set->parsed.deref,
 			    "deref", set->deref) < 0)
 		return -1;
 #ifdef LDAP_OPT_DEBUG_LEVEL
@@ -1245,7 +1245,7 @@ int sieve_ldap_db_lookup_script(struct ldap_connection *conn, const char *name,
 		return -1;
 	}
 
-	request->request.scope = lstorage->set->ldap_scope;
+	request->request.scope = lstorage->set->parsed.scope;
 	request->request.filter = p_strdup(pool, str_c(str));
 	request->request.attributes = attr_names;
 

src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c

@@ -161,13 +161,13 @@ sieve_ldap_settings_check(struct sieve_ldap_storage_settings *set,
 		env_put("LDAPRC", set->ldaprc_path);
 	}
 
-	if (ldap_deref_from_str(set->deref, &set->ldap_deref) < 0) {
+	if (ldap_deref_from_str(set->deref, &set->parsed.deref) < 0) {
 		*error_r = t_strdup_printf(
 			"Invalid deref option '%s'", set->deref);
 		return FALSE;
 	}
 
-	if (ldap_scope_from_str(set->scope, &set->ldap_scope) < 0) {
+	if (ldap_scope_from_str(set->scope, &set->parsed.scope) < 0) {
 		*error_r = t_strdup_printf(
 			"Invalid scope option '%s'", set->scope);
 		return FALSE;
@@ -177,7 +177,7 @@ sieve_ldap_settings_check(struct sieve_ldap_storage_settings *set,
 	if (set->tls_require_cert != NULL &&
 	    ldap_tls_require_cert_from_str(
 		set->tls_require_cert,
-		&set->ldap_tls_require_cert) < 0) {
+		&set->parsed.tls_require_cert) < 0) {
 		*error_r = t_strdup_printf(
 			"Invalid tls_require_cert option '%s'",
 			set->tls_require_cert);

src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h

@@ -33,7 +33,9 @@ struct sieve_ldap_storage_settings {
 	const char *sieve_ldap_filter;
 
 	/* ... */
-	int ldap_deref, ldap_scope, ldap_tls_require_cert;
+	struct {
+		int deref, scope, tls_require_cert;
+	} parsed;
 };
 
 #endif