auth: Use named initializers for passdb_module_interface

diff --git a/src/auth/passdb-bsdauth.c b/src/auth/passdb-bsdauth.c
index 25ab8b479f4669820446305786cefcdd5663ae0d..c8f2c1e39e6e3f2d95103683190f2150d71335be 100644 (file)
--- a/src/auth/passdb-bsdauth.c
+++ b/src/auth/passdb-bsdauth.c
@@ -81,15 +81,11 @@ static void bsdauth_deinit(struct passdb_module *module ATTR_UNUSED)
 }
 
 struct passdb_module_interface passdb_bsdauth = {
-       "bsdauth",
+       .name = "bsdauth",
 
-       bsdauth_preinit,
-       NULL,
-       bsdauth_deinit,
-
-       bsdauth_verify_plain,
-       NULL,
-       NULL
+       .preinit_legacy = bsdauth_preinit,
+       .deinit = bsdauth_deinit,
+       .verify_plain = bsdauth_verify_plain,
 };
 #else
 struct passdb_module_interface passdb_bsdauth = {

diff --git a/src/auth/passdb-imap.c b/src/auth/passdb-imap.c
index 67a99045974ef67b3649224a50db2dc5a1470e12..786453f23f7e801321c59434b15d1012869d9a84 100644 (file)
--- a/src/auth/passdb-imap.c
+++ b/src/auth/passdb-imap.c
@@ -194,15 +194,9 @@ passdb_imap_preinit(pool_t pool, const char *args)
 }
 
 static struct passdb_module_interface passdb_imap_plugin = {
-       "imap",
-
-       passdb_imap_preinit,
-       NULL,
-       NULL,
-
-       passdb_imap_verify_plain,
-       NULL,
-       NULL
+       .name = "imap",
+       .preinit_legacy = passdb_imap_preinit,
+       .verify_plain = passdb_imap_verify_plain,
 };
 
 void authdb_imap_init(void);

diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index 331e7414c8c92d0dc019e16c5533733ff4e9e78b..c6e5cd1b774d39af662a38d57141c151752addde 100644 (file)
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -497,15 +497,14 @@ struct passdb_module_interface passdb_ldap =
 struct passdb_module_interface passdb_ldap_plugin =
 #endif
 {
-       "ldap",
+       .name = "ldap",
 
-       passdb_ldap_preinit,
-       passdb_ldap_init,
-       passdb_ldap_deinit,
+       .preinit_legacy = passdb_ldap_preinit,
+       .init = passdb_ldap_init,
+       .deinit = passdb_ldap_deinit,
 
-       ldap_verify_plain,
-       ldap_lookup_credentials,
-       NULL
+       .verify_plain = ldap_verify_plain,
+       .lookup_credentials = ldap_lookup_credentials,
 };
 #else
 struct passdb_module_interface passdb_ldap = {

diff --git a/src/auth/passdb-lua.c b/src/auth/passdb-lua.c
index 9da4b75660833576924a6ca7cf64651b9be76f41..3b7d8c1d21fd7b7111459d5c9f6907e4b74bacba 100644 (file)
--- a/src/auth/passdb-lua.c
+++ b/src/auth/passdb-lua.c
@@ -196,15 +196,14 @@ struct passdb_module_interface passdb_lua =
 struct passdb_module_interface passdb_lua_plugin =
 #endif
 {
-       "lua",
+       .name = "lua",
 
-       passdb_lua_preinit,
-       passdb_lua_init,
-       passdb_lua_deinit,
+       .preinit_legacy = passdb_lua_preinit,
+       .init = passdb_lua_init,
+       .deinit = passdb_lua_deinit,
 
-       passdb_lua_verify_plain,
-       passdb_lua_lookup_credentials,
-       NULL
+       .verify_plain = passdb_lua_verify_plain,
+       .lookup_credentials = passdb_lua_lookup_credentials,
 };
 #else
 struct passdb_module_interface passdb_lua = {

diff --git a/src/auth/passdb-oauth2.c b/src/auth/passdb-oauth2.c
index e52a73f573ef7e35a13498184ac44a9588317a22..52245a05fea25bab6ea9c61988dd27a8a4fe8960 100644 (file)
--- a/src/auth/passdb-oauth2.c
+++ b/src/auth/passdb-oauth2.c
@@ -78,13 +78,9 @@ const char *passdb_oauth2_get_oidc_url(struct passdb_module *passdb)
 }
 
 struct passdb_module_interface passdb_oauth2 = {
-       "oauth2",
+       .name = "oauth2",
 
-       oauth2_preinit,
-       NULL,
-       oauth2_deinit,
-
-       oauth2_verify_plain,
-       NULL,
-       NULL
+       .preinit_legacy = oauth2_preinit,
+       .deinit = oauth2_deinit,
+       .verify_plain = oauth2_verify_plain,
 };

diff --git a/src/auth/passdb-pam.c b/src/auth/passdb-pam.c
index 822f3755f144ef0ee680fab5c71cd9ebc2e9f10c..0ecc0084343c2178c76e71e4a0e29e123edaf75b 100644 (file)
--- a/src/auth/passdb-pam.c
+++ b/src/auth/passdb-pam.c
@@ -383,15 +383,9 @@ pam_preinit(pool_t pool, const char *args)
 }
 
 struct passdb_module_interface passdb_pam = {
-       "pam",
-
-       pam_preinit,
-       NULL,
-       NULL,
-
-       pam_verify_plain,
-       NULL,
-       NULL
+       .name = "pam",
+       .preinit_legacy = pam_preinit,
+       .verify_plain = pam_verify_plain,
 };
 #else
 struct passdb_module_interface passdb_pam = {

diff --git a/src/auth/passdb-passwd-file.c b/src/auth/passdb-passwd-file.c
index dcd188485bf58d1a813d735a223b0d455daf4346..d702fc36951b1766f88dd80c2bbff3e6b1a582f0 100644 (file)
--- a/src/auth/passdb-passwd-file.c
+++ b/src/auth/passdb-passwd-file.c
@@ -193,15 +193,14 @@ static void passwd_file_deinit(struct passdb_module *_module)
 }
 
 struct passdb_module_interface passdb_passwd_file = {
-       "passwd-file",
+       .name = "passwd-file",
 
-       passwd_file_preinit,
-       passwd_file_init,
-       passwd_file_deinit,
+       .preinit_legacy = passwd_file_preinit,
+       .init = passwd_file_init,
+       .deinit = passwd_file_deinit,
 
-       passwd_file_verify_plain,
-       passwd_file_lookup_credentials,
-       NULL
+       .verify_plain = passwd_file_verify_plain,
+       .lookup_credentials = passwd_file_lookup_credentials,
 };
 #else
 struct passdb_module_interface passdb_passwd_file = {

diff --git a/src/auth/passdb-passwd.c b/src/auth/passdb-passwd.c
index e52e7f93b8a615ec9f32db5d79ac6de34a4be292..81e19093c3129803304184abf6d38b983538cfa9 100644 (file)
--- a/src/auth/passdb-passwd.c
+++ b/src/auth/passdb-passwd.c
@@ -109,15 +109,13 @@ static void passwd_deinit(struct passdb_module *module ATTR_UNUSED)
 }
 
 struct passdb_module_interface passdb_passwd = {
-       "passwd",
+       .name = "passwd",
 
-       passwd_preinit,
-       NULL,
-       passwd_deinit,
+       .preinit_legacy = passwd_preinit,
+       .deinit = passwd_deinit,
 
-       passwd_verify_plain,
-       passwd_lookup_credentials,
-       NULL
+       .verify_plain = passwd_verify_plain,
+       .lookup_credentials = passwd_lookup_credentials,
 };
 
 #else

diff --git a/src/auth/passdb-sql.c b/src/auth/passdb-sql.c
index 120e54f4ec7914a79cba686f53311139c85d29fe..3dae4cdfe965c624e66653a79c33030cac015af0 100644 (file)
--- a/src/auth/passdb-sql.c
+++ b/src/auth/passdb-sql.c
@@ -299,15 +299,15 @@ static void passdb_sql_deinit(struct passdb_module *_module)
 }
 
 struct passdb_module_interface passdb_sql = {
-       "sql",
+       .name = "sql",
 
-       passdb_sql_preinit,
-       passdb_sql_init,
-       passdb_sql_deinit,
+       .preinit_legacy = passdb_sql_preinit,
+       .init = passdb_sql_init,
+       .deinit = passdb_sql_deinit,
 
-       sql_verify_plain,
-       sql_lookup_credentials,
-       sql_set_credentials
+       .verify_plain = sql_verify_plain,
+       .lookup_credentials = sql_lookup_credentials,
+       .set_credentials = sql_set_credentials
 };
 #else
 struct passdb_module_interface passdb_sql = {

diff --git a/src/auth/passdb-static.c b/src/auth/passdb-static.c
index e2d57aeacfa065ce84f00d68acc113df3f7ed1e9..47ecb10b1dcce001f05c640589d149205e3f9f54 100644 (file)
--- a/src/auth/passdb-static.c
+++ b/src/auth/passdb-static.c
@@ -101,13 +101,9 @@ static_preinit(pool_t pool, const char *args)
 }
 
 struct passdb_module_interface passdb_static = {
-       "static",
+       .name = "static",
 
-       static_preinit,
-       NULL,
-       NULL,
-
-       static_verify_plain,
-       static_lookup_credentials,
-       NULL
+       .preinit_legacy = static_preinit,
+       .verify_plain = static_verify_plain,
+       .lookup_credentials = static_lookup_credentials,
 };