From f71d7927945dbcd707ce450f4d491cda07fe7607 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 17 Jan 2024 18:50:35 -0500 Subject: [PATCH] auth: Use named initializers for userdb_module_interface --- src/auth/userdb-ldap.c | 16 ++++++++-------- src/auth/userdb-lua.c | 16 ++++++++-------- src/auth/userdb-passwd-file.c | 16 ++++++++-------- src/auth/userdb-passwd.c | 14 ++++++-------- src/auth/userdb-prefetch.c | 13 ++----------- src/auth/userdb-sql.c | 16 ++++++++-------- src/auth/userdb-static.c | 13 +++---------- 7 files changed, 43 insertions(+), 61 deletions(-) diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c index 29d409ab57..385a43ba2b 100644 --- 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 83944edac3..d8351c974a 100644 --- 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 b9f736824c..ded45a054c 100644 --- 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 2623dff58a..d6f80f9f21 100644 --- 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 a5730b9872..e2c6d4604e 100644 --- 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 9a3beaf253..9527eca524 100644 --- 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 4263262794..fe0dd24450 100644 --- 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, }; -- 2.47.3