global: Rename auth_default_realm into auth_default_domain

diff --git a/doc/example-config/conf.d/10-auth.conf b/doc/example-config/conf.d/10-auth.conf
index ce56ff41aa80bf2bfaea468b259100be0baa0657..ccf034ce80e2299148ae4369fd3efe14d2b6ca68 100644 (file)
--- a/doc/example-config/conf.d/10-auth.conf
+++ b/doc/example-config/conf.d/10-auth.conf
@@ -30,7 +30,7 @@
 
 # Default realm/domain to use if none was specified. This is used for both
 # SASL realms and appending @domain to username in plaintext logins.
-#auth_default_realm =
+#auth_default_domain =
 
 # List of allowed characters in username. If the user-given username contains
 # a character not listed in here, the login automatically fails. This is just

diff --git a/src/auth/auth-request-fields.c b/src/auth/auth-request-fields.c
index 9335e90f08c309076abc8966d2a6eaeabae8f371..6f94b8176529660583ad11d9ff90caf03920f894 100644 (file)
--- a/src/auth/auth-request-fields.c
+++ b/src/auth/auth-request-fields.c
@@ -293,10 +293,10 @@ auth_request_fix_username(struct auth_request *request, const char **username,
        unsigned char *p;
        char *user;
 
-       if (*set->default_realm != '\0' &&
+       if (*set->default_domain != '\0' &&
            strchr(*username, '@') == NULL) {
                user = p_strconcat(unsafe_data_stack_pool, *username, "@",
-                                  set->default_realm, NULL);
+                                  set->default_domain, NULL);
        } else {
                user = t_strdup_noconst(*username);
        }

diff --git a/src/auth/auth-settings.c b/src/auth/auth-settings.c
index a3ba8b63857ab2e3b7c01db8ae34cc67b52aa0d6..a9ea4bd04d95f80ccce2e9313f8a686a1b0a3261 100644 (file)
--- a/src/auth/auth-settings.c
+++ b/src/auth/auth-settings.c
@@ -228,7 +228,7 @@ const struct setting_parser_info auth_userdb_setting_parser_info = {
 static const struct setting_define auth_setting_defines[] = {
        DEF(STR, mechanisms),
        DEF(STR, realms),
-       DEF(STR, default_realm),
+       DEF(STR, default_domain),
        DEF(SIZE, cache_size),
        DEF(TIME, cache_ttl),
        DEF(TIME, cache_negative_ttl),
@@ -285,7 +285,7 @@ static const struct setting_define auth_setting_defines[] = {
 static const struct auth_settings auth_default_settings = {
        .mechanisms = "plain",
        .realms = "",
-       .default_realm = "",
+       .default_domain = "",
        .cache_size = 0,
        .cache_ttl = 60*60,
        .cache_negative_ttl = 60*60,

diff --git a/src/auth/auth-settings.h b/src/auth/auth-settings.h
index fc4ec7008efa61038c4520d3b163ba82e803d56b..08d696e2b92b0044002faa1c92ed35f8931d2033 100644 (file)
--- a/src/auth/auth-settings.h
+++ b/src/auth/auth-settings.h
@@ -40,7 +40,7 @@ struct auth_userdb_settings {
 struct auth_settings {
        const char *mechanisms;
        const char *realms;
-       const char *default_realm;
+       const char *default_domain;
        uoff_t cache_size;
        unsigned int cache_ttl;
        unsigned int cache_negative_ttl;

diff --git a/src/auth/test-lua.c b/src/auth/test-lua.c
index c35848940e53c739c91442292ca04dfb4d88d9c6..6360de9e81e2fb7ef7acd3c401dfdbfeb800130e 100644 (file)
--- a/src/auth/test-lua.c
+++ b/src/auth/test-lua.c
@@ -10,7 +10,7 @@
 
 static struct auth_settings test_lua_auth_set = {
        .master_user_separator = "",
-       .default_realm = "",
+       .default_domain = "",
        .username_format = "",
 };
 

diff --git a/src/config/old-set-parser.c b/src/config/old-set-parser.c
index cd584403c6c87571a06b48672757d588411d8aea..81258f24d2b1f3ce02de0aaea724db7c37e4a4e7 100644 (file)
--- a/src/config/old-set-parser.c
+++ b/src/config/old-set-parser.c
@@ -245,6 +245,10 @@ old_settings_handle_root(struct config_parser_context *ctx,
                set_rename(ctx, key, new_key, value);
                return TRUE;
        }
+       if (strcmp(key, "auth_default_realm") == 0) {
+               set_rename(ctx, key, "auth_default_domain", value);
+               return TRUE;
+       }
        if (strcmp(key, "imap_client_workarounds") == 0) {
                char **args, **arg;