Crashfix.

--HG--
branch : HEAD

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 5d1c346e548d6cd8dc205b73b542e1f896c26bfa..577cfb6963869136ab8234f7bcf72208548986da 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -117,27 +117,28 @@ user_reply_handle(struct setting_parser_context *set_parser,
        }
 
        str = array_get(&reply->extra_fields, &count);
-       for (i = 0; i < count && ret == 0; i++) T_BEGIN {
+       for (i = 0; i < count && ret == 0; i++) {
                line = str[i];
-               if (strncmp(line, "system_groups_user=", 19) == 0) {
+               if (strncmp(line, "system_groups_user=", 19) == 0)
                        *system_groups_user_r = line + 19;
-                       continue;
-               }
-               if (strncmp(line, "mail=", 5) == 0)
-                       line = t_strconcat("mail_location=", line + 5, NULL);
-               else if ((p = strchr(str[i], '=')) == NULL)
-                       line = t_strconcat(str[i], "=yes", NULL);
-               else
-                       line = str[i];
-
-               key = t_strcut(line, '=');
-               if (!settings_parse_is_valid_key(set_parser, key)) {
-                       /* assume it's a plugin setting */
-                       line = t_strconcat("plugin/", line, NULL);
-               }
+               else T_BEGIN {
+                       if (strncmp(line, "mail=", 5) == 0) {
+                               line = t_strconcat("mail_location=",
+                                                  line + 5, NULL);
+                       } else if ((p = strchr(str[i], '=')) == NULL)
+                               line = t_strconcat(str[i], "=yes", NULL);
+                       else
+                               line = str[i];
+
+                       key = t_strcut(line, '=');
+                       if (!settings_parse_is_valid_key(set_parser, key)) {
+                               /* assume it's a plugin setting */
+                               line = t_strconcat("plugin/", line, NULL);
+                       }
 
-               ret = settings_parse_line(set_parser, line);
-       } T_END;
+                       ret = settings_parse_line(set_parser, line);
+               } T_END;
+       }
 
        if (ret < 0) {
                *error_r = t_strdup_printf("Invalid userdb input '%s': %s",