lib-storage: Remove mail_storage_settings.hostname

It exists also in mail_user_settings, which is a better place for it.

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index 65dbd248ab554adfcdc52f899970a2abe817e167..0c70d87a85a72c8293370a97ea70ef100ad64d83 100644 (file)
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -81,7 +81,6 @@ static const struct setting_define mail_storage_setting_defines[] = {
        DEF(ENUM, lock_method),
        DEF(STR, pop3_uidl_format),
 
-       DEF(STR, hostname),
        DEF(STR, recipient_delimiter),
 
        SETTING_DEFINE_LIST_END
@@ -138,7 +137,6 @@ const struct mail_storage_settings mail_storage_default_settings = {
        .lock_method = "fcntl:flock:dotlock",
        .pop3_uidl_format = "%08Xu%08Xv",
 
-       .hostname = "",
        .recipient_delimiter = "+",
 };
 
@@ -483,11 +481,6 @@ static bool mail_storage_settings_check(void *_set, pool_t pool,
 
        // FIXME: check set->mail_server_admin syntax (RFC 5464, Section 6.2.2)
 
-#ifndef CONFIG_BINARY
-       if (*set->hostname == '\0')
-               set->hostname = p_strdup(pool, my_hostdomain());
-#endif
-
        /* parse mail_attachment_indicator_options */
        if (*set->mail_attachment_detection_options != '\0') {
                ARRAY_TYPE(const_string) content_types;

diff --git a/src/lib-storage/mail-storage-settings.h b/src/lib-storage/mail-storage-settings.h
index 131ab132358192983c5e8875c4a572de8f2ef1ee..bfec46e8a32f75fd5eef4534dbc4ef1f14c04f47 100644 (file)
--- a/src/lib-storage/mail-storage-settings.h
+++ b/src/lib-storage/mail-storage-settings.h
@@ -62,7 +62,6 @@ struct mail_storage_settings {
        const char *lock_method;
        const char *pop3_uidl_format;
 
-       const char *hostname;
        const char *recipient_delimiter;
 
        const char *mail_attachment_detection_options;