dovecot-2.2: lib-storage: Added %{session} to mail_user_var_expa...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/ddde8c6a5b70
changeset: 17863:ddde8c6a5b70
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Oct 02 19:43:09 2014 +0300
description:
lib-storage: Added %{session} to mail_user_var_expand_table()

diffstat:

 src/lib-storage/mail-user.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r c3ef6f19d518 -r ddde8c6a5b70 src/lib-storage/mail-user.c
--- a/src/lib-storage/mail-user.c	Thu Oct 02 13:15:22 2014 +0300
+++ b/src/lib-storage/mail-user.c	Thu Oct 02 19:43:09 2014 +0300
@@ -207,6 +207,7 @@
 		{ 'p', NULL, "pid" },
 		{ 'i', NULL, "uid" },
 		{ '\0', NULL, "gid" },
+		{ '\0', NULL, "session" },
 		{ '\0', NULL, "auth_user" },
 		{ '\0', NULL, "auth_username" },
 		{ '\0', NULL, "auth_domain" },
@@ -235,14 +236,15 @@
 	tab[7].value = my_pid;
 	tab[8].value = p_strdup(user->pool, dec2str(user->uid));
 	tab[9].value = p_strdup(user->pool, dec2str(user->gid));
+	tab[10].value = user->session_id;
 	if (user->auth_user == NULL) {
-		tab[10].value = tab[0].value;
-		tab[11].value = tab[1].value;
-		tab[12].value = tab[2].value;
+		tab[11].value = tab[0].value;
+		tab[12].value = tab[1].value;
+		tab[13].value = tab[2].value;
 	} else {
-		tab[10].value = user->auth_user;
-		tab[11].value = t_strcut(user->auth_user, '@');
-		tab[12].value = strchr(user->auth_user, '@');
+		tab[11].value = user->auth_user;
+		tab[12].value = t_strcut(user->auth_user, '@');
+		tab[13].value = strchr(user->auth_user, '@');
 	}
 
 	user->var_expand_table = tab;