auth: Use named initializers for userdb_module_interface

diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
index 29d409ab573622f5aaeea85a03c659c2343b66e5..385a43ba2b696cf9e5ad87d8b1cdba6ad24a765a 100644 (file)
--- a/src/auth/userdb-ldap.c
+++ b/src/auth/userdb-ldap.c
@@ -324,17 +324,17 @@ struct userdb_module_interface userdb_ldap =
 struct userdb_module_interface userdb_ldap_plugin =
 #endif
 {
-       "ldap",
+       .name = "ldap",
 
-       userdb_ldap_preinit,
-       userdb_ldap_init,
-       userdb_ldap_deinit,
+       .preinit_legacy = userdb_ldap_preinit,
+       .init = userdb_ldap_init,
+       .deinit = userdb_ldap_deinit,
 
-       userdb_ldap_lookup,
+       .lookup = userdb_ldap_lookup,
 
-       userdb_ldap_iterate_init,
-       userdb_ldap_iterate_next,
-       userdb_ldap_iterate_deinit
+       .iterate_init = userdb_ldap_iterate_init,
+       .iterate_next = userdb_ldap_iterate_next,
+       .iterate_deinit = userdb_ldap_iterate_deinit
 };
 #else
 struct userdb_module_interface userdb_ldap = {

diff --git a/src/auth/userdb-lua.c b/src/auth/userdb-lua.c
index 83944edac3354eb9a1ddb5acc56f4204b4966653..d8351c974a752671407d7faa1f1b880ab6526894 100644 (file)
--- a/src/auth/userdb-lua.c
+++ b/src/auth/userdb-lua.c
@@ -141,17 +141,17 @@ struct userdb_module_interface userdb_lua =
 struct userdb_module_interface userdb_lua_plugin =
 #endif
 {
-       "lua",
+       .name = "lua",
 
-       userdb_lua_preinit,
-       userdb_lua_init,
-       userdb_lua_deinit,
+       .preinit_legacy = userdb_lua_preinit,
+       .init = userdb_lua_init,
+       .deinit = userdb_lua_deinit,
 
-       userdb_lua_lookup,
+       .lookup = userdb_lua_lookup,
 
-       userdb_lua_iterate_init,
-       userdb_lua_iterate_next,
-       userdb_lua_iterate_deinit
+       .iterate_init = userdb_lua_iterate_init,
+       .iterate_next = userdb_lua_iterate_next,
+       .iterate_deinit = userdb_lua_iterate_deinit
 };
 #else
 struct userdb_module_interface userdb_lua = {

diff --git a/src/auth/userdb-passwd-file.c b/src/auth/userdb-passwd-file.c
index b9f736824c6f0c2490d36d6a2ff4f2d44acb35bc..ded45a054ca7bb4b3b8adacb82c082311c117263 100644 (file)
--- a/src/auth/userdb-passwd-file.c
+++ b/src/auth/userdb-passwd-file.c
@@ -226,17 +226,17 @@ static void passwd_file_deinit(struct userdb_module *_module)
 }
 
 struct userdb_module_interface userdb_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_lookup,
+       .lookup = passwd_file_lookup,
 
-       passwd_file_iterate_init,
-       passwd_file_iterate_next,
-       passwd_file_iterate_deinit
+       .iterate_init = passwd_file_iterate_init,
+       .iterate_next = passwd_file_iterate_next,
+       .iterate_deinit = passwd_file_iterate_deinit
 };
 #else
 struct userdb_module_interface userdb_passwd_file = {

diff --git a/src/auth/userdb-passwd.c b/src/auth/userdb-passwd.c
index 2623dff58abc4636b5dc4252b240c097f589991d..d6f80f9f213b461f6c68477505fee625271b0750 100644 (file)
--- a/src/auth/userdb-passwd.c
+++ b/src/auth/userdb-passwd.c
@@ -236,17 +236,15 @@ passwd_passwd_preinit(pool_t pool, const char *args)
 }
 
 struct userdb_module_interface userdb_passwd = {
-       "passwd",
+       .name = "passwd",
 
-       passwd_passwd_preinit,
-       NULL,
-       NULL,
+       .preinit_legacy = passwd_passwd_preinit,
 
-       passwd_lookup,
+       .lookup = passwd_lookup,
 
-       passwd_iterate_init,
-       passwd_iterate_next,
-       passwd_iterate_deinit
+       .iterate_init = passwd_iterate_init,
+       .iterate_next = passwd_iterate_next,
+       .iterate_deinit = passwd_iterate_deinit
 };
 #else
 struct userdb_module_interface userdb_passwd = {

diff --git a/src/auth/userdb-prefetch.c b/src/auth/userdb-prefetch.c
index a5730b9872d3c3890b52f2098c9e15a72c286bcf..e2c6d4604e5d240869a0f0e8534812d9c83f123e 100644 (file)
--- a/src/auth/userdb-prefetch.c
+++ b/src/auth/userdb-prefetch.c
@@ -40,17 +40,8 @@ static void prefetch_lookup(struct auth_request *auth_request,
 }
 
 struct userdb_module_interface userdb_prefetch = {
-       "prefetch",
-
-       NULL,
-       NULL,
-       NULL,
-
-       prefetch_lookup,
-
-       NULL,
-       NULL,
-       NULL
+       .name = "prefetch",
+       .lookup = prefetch_lookup,
 };
 #else
 struct userdb_module_interface userdb_prefetch = {

diff --git a/src/auth/userdb-sql.c b/src/auth/userdb-sql.c
index 9a3beaf25305a6d4ab4074ed10ea8856737cdc59..9527eca52403d9d24d73371fedb89ba5d031e87f 100644 (file)
--- a/src/auth/userdb-sql.c
+++ b/src/auth/userdb-sql.c
@@ -300,17 +300,17 @@ static void userdb_sql_deinit(struct userdb_module *_module)
 }
 
 struct userdb_module_interface userdb_sql = {
-       "sql",
+       .name = "sql",
 
-       userdb_sql_preinit,
-       userdb_sql_init,
-       userdb_sql_deinit,
+       .preinit_legacy = userdb_sql_preinit,
+       .init = userdb_sql_init,
+       .deinit = userdb_sql_deinit,
 
-       userdb_sql_lookup,
+       .lookup = userdb_sql_lookup,
 
-       userdb_sql_iterate_init,
-       userdb_sql_iterate_next,
-       userdb_sql_iterate_deinit
+       .iterate_init = userdb_sql_iterate_init,
+       .iterate_next = userdb_sql_iterate_next,
+       .iterate_deinit = userdb_sql_iterate_deinit
 };
 #else
 struct userdb_module_interface userdb_sql = {

diff --git a/src/auth/userdb-static.c b/src/auth/userdb-static.c
index 4263262794a0610655b57b1d2d6286343796f28d..fe0dd2445003639cbb8e9423d18b07922ce88ec9 100644 (file)
--- a/src/auth/userdb-static.c
+++ b/src/auth/userdb-static.c
@@ -131,15 +131,8 @@ static_preinit(pool_t pool, const char *args)
 }
 
 struct userdb_module_interface userdb_static = {
-       "static",
+       .name = "static",
 
-       static_preinit,
-       NULL,
-       NULL,
-
-       static_lookup,
-
-       NULL,
-       NULL,
-       NULL
+       .preinit_legacy = static_preinit,
+       .lookup = static_lookup,
 };