auth: Removed extra string escaping from places where it's not necessary (or is even...

--HG--
branch : HEAD

diff --git a/src/auth/auth-cache.c b/src/auth/auth-cache.c
index 4e9b4e44fb425c4d1d370e712e014c4c6f6dfda5..b90b91682ca64eea43037db702aaace7aec62334 100644 (file)
--- a/src/auth/auth-cache.c
+++ b/src/auth/auth-cache.c
@@ -166,8 +166,7 @@ auth_cache_lookup(struct auth_cache *cache, const struct auth_request *request,
        str = t_str_new(256);
        var_expand(str, t_strconcat(request->userdb_lookup ? "U" : "P",
                                    "%!/", key, NULL),
-                  auth_request_get_var_expand_table(request,
-                                                    auth_request_str_escape));
+                  auth_request_get_var_expand_table(request, NULL));
 
        node = hash_table_lookup(cache->hash, str_c(str));
        if (node == NULL) {
@@ -220,8 +219,7 @@ void auth_cache_insert(struct auth_cache *cache, struct auth_request *request,
        str = t_str_new(256);
        var_expand(str, t_strconcat(request->userdb_lookup ? "U" : "P",
                                    "%!/", key, NULL),
-                  auth_request_get_var_expand_table(request,
-                                                    auth_request_str_escape));
+                  auth_request_get_var_expand_table(request, NULL));
 
        request->user = current_username;
 
@@ -262,8 +260,7 @@ void auth_cache_remove(struct auth_cache *cache,
 
        str = t_str_new(256);
        var_expand(str, key,
-                  auth_request_get_var_expand_table(request,
-                                                    auth_request_str_escape));
+                  auth_request_get_var_expand_table(request, NULL));
 
        node = hash_table_lookup(cache->hash, str_c(str));
        if (node == NULL)

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index a87e52159c01c91fdc38029f46466ccda5f9a1f5..5bdf60d5c7eacf4f444df1e1edec5012810e56d1 100644 (file)
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -803,8 +803,7 @@ auth_request_fix_username(struct auth_request *request, const char *username,
                request->user = user;
 
                dest = t_str_new(256);
-               table = auth_request_get_var_expand_table(request,
-                                               auth_request_str_escape);
+               table = auth_request_get_var_expand_table(request, NULL);
                var_expand(dest, request->auth->username_format, table);
                user = p_strdup(request->pool, str_c(dest));