auth: passwd-file - Add all fields to passwd_file provider

diff --git a/src/auth/passdb-passwd-file.c b/src/auth/passdb-passwd-file.c
index 0a45f9642939579e170fbf4e4dd3c6b901aee0b3..14daf7e51b4e3738058aba876e2f8dcbc9b66b3c 100644 (file)
--- a/src/auth/passdb-passwd-file.c
+++ b/src/auth/passdb-passwd-file.c
@@ -51,8 +51,7 @@ passwd_file_add_extra_fields(struct auth_request *request,
                }
                if (request->passdb->set->fields_import_all)
                        auth_request_set_field(request, key, value, NULL);
-               if (!str_begins_with(fields[i], "userdb_"))
-                       auth_fields_add(pwd_fields, key, value, 0);
+               auth_fields_add(pwd_fields, key, value, 0);
        }
 
        if (ret == 0 && auth_request_set_passdb_fields_ex(request, pwd_fields, "PLAIN",

diff --git a/src/auth/userdb-passwd-file.c b/src/auth/userdb-passwd-file.c
index 94973ba4157bccd4de64b880cee231b1ee336fb3..b3ed1a3ca45ff9ffd41b92b38f94b17b0a99c5cc 100644 (file)
--- a/src/auth/userdb-passwd-file.c
+++ b/src/auth/userdb-passwd-file.c
@@ -41,9 +41,7 @@ passwd_file_add_extra_fields(struct auth_request *request,
        table = auth_request_get_var_expand_table(request);
 
        for (i = 0; fields[i] != NULL; i++) {
-               if (!str_begins(fields[i], "userdb_", &key))
-                       continue;
-
+               key = fields[i];
                value = strchr(key, '=');
                if (value != NULL) {
                        key = t_strdup_until(key, value);
@@ -60,7 +58,8 @@ passwd_file_add_extra_fields(struct auth_request *request,
                } else {
                        value = "";
                }
-               if (request->userdb->set->fields_import_all)
+               if (request->userdb->set->fields_import_all &&
+                   str_begins(key, "userdb_", &key))
                        auth_request_set_userdb_field(request, key, value);
                auth_fields_add(pwd_fields, key, value, 0);
        }