Skip to content

Commit

Permalink
%{auth_domain} shouldn't include the leading '@'
Browse files Browse the repository at this point in the history
  • Loading branch information
sirainen committed Oct 20, 2016
1 parent 2202915 commit 7205301
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/imap-hibernate/imap-client.c
Expand Up @@ -485,6 +485,7 @@ imap_client_get_var_expand_table(struct imap_client *client)
tab[11].value = auth_user;
tab[12].value = t_strcut(auth_user, '@');
tab[13].value = strchr(auth_user, '@');
if (tab[13].value != NULL) tab[13].value++;
}
return tab;
}
Expand Down
1 change: 1 addition & 0 deletions src/lib-storage/mail-storage-service.c
Expand Up @@ -436,6 +436,7 @@ get_var_expand_table(struct master_service *service,
tab[10].value = user->auth_user;
tab[11].value = t_strcut(user->auth_user, '@');
tab[12].value = strchr(user->auth_user, '@');
if (tab[12].value != NULL) tab[12].value++;
}
return tab;
}
Expand Down
1 change: 1 addition & 0 deletions src/lib-storage/mail-user.c
Expand Up @@ -260,6 +260,7 @@ mail_user_var_expand_table(struct mail_user *user)
tab[11].value = user->auth_user;
tab[12].value = p_strdup(user->pool, t_strcut(user->auth_user, '@'));
tab[13].value = strchr(user->auth_user, '@');
if (tab[13].value != NULL) tab[13].value++;
}

user->var_expand_table = tab;
Expand Down

0 comments on commit 7205301

Please sign in to comment.