]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
auth: passwd-file - Remove support for "old" format
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Mon, 27 Nov 2023 21:40:59 +0000 (23:40 +0200)
committerAki Tuomi <aki.tuomi@open-xchange.com>
Wed, 12 Feb 2025 10:34:11 +0000 (12:34 +0200)
The new format was added in v1.0, so it's unlikely the old format is still
being used. Also now that mail_location setting is split, the old format
wouldn't work anymore anyway.

src/auth/db-passwd-file.c

index 25e6ce7cbfca47909a1041271e12129fbf701368..c92986ac2e8d43ee7d4ab9b29353c06049717556 100644 (file)
@@ -123,18 +123,8 @@ passwd_file_add(struct passwd_file *pw, const char *username,
        if (*args != NULL)
                args++;
 
-       if (*args != NULL && **args == '\0') {
-               /* old format, this field is empty and next field may
-                  contain MAIL */
-               args++;
-               if (*args != NULL && **args != '\0' && pw->db->userdb) {
-                       extra_fields =
-                                t_strconcat("userdb_mail=",
-                                            t_strarray_join(args, ":"), NULL);
-               }
-       } else if (*args != NULL) {
-               /* new format, contains a space separated list of
-                  extra fields */
+       if (*args != NULL) {
+               /* space separated list of extra fields */
                 extra_fields = t_strarray_join(args, ":");
         }