From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Fri, 15 Mar 2024 10:05:40 +0000 (+0000)
Subject: auth: struct ldap_settings - Reorder fields by type [BUILD-BROKEN]
X-Git-Tag: 2.4.0~507
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0dde6a6cfabfbfa7b1bd4aaafbf7514fd9c4aa26;p=thirdparty%2Fdovecot%2Fcore.git

auth: struct ldap_settings - Reorder fields by type [BUILD-BROKEN]

(build broken until next commits)
---

diff --git a/src/auth/db-ldap-settings.h b/src/auth/db-ldap-settings.h
index 8fe2e86319..6c4a39c7c4 100644
--- a/src/auth/db-ldap-settings.h
+++ b/src/auth/db-ldap-settings.h
@@ -6,11 +6,8 @@ struct ldap_settings {
 	const char *uris;
 	const char *dn;
 	const char *dnpass;
-	bool auth_bind;
 	const char *auth_bind_userdn;
 
-	bool tls;
-	bool sasl_bind;
 	const char *sasl_mech;
 	const char *sasl_realm;
 	const char *sasl_authz_id;
@@ -25,7 +22,6 @@ struct ldap_settings {
 	const char *deref;
 	const char *scope;
 	const char *base;
-	unsigned int ldap_version;
 
 	const char *ldaprc_path;
 	const char *debug_level;
@@ -38,12 +34,20 @@ struct ldap_settings {
 	const char *iterate_filter;
 
 	const char *default_pass_scheme;
-	bool blocking;
 
-	/* ... */
-	int ldap_deref, ldap_scope, ldap_tls_require_cert_parsed;
+	unsigned int ldap_version;
+
+	int ldap_deref;
+	int ldap_scope;
+	int ldap_tls_require_cert_parsed;
+
 	uid_t uid;
 	gid_t gid;
+
+	bool auth_bind;
+	bool tls;
+	bool sasl_bind;
+	bool blocking;
 };
 
 #endif