- rel 4; make local_name working in login_log_format

diff --git a/dovecot-local-name.patch b/dovecot-local-name.patch
index b1be551bd71e73c0d7250ef08843d340c3112aa7..2e7f16d9b377bf45407373c19875929260b9996e 100644 (file)
--- a/dovecot-local-name.patch
+++ b/dovecot-local-name.patch
@@ -244,3 +244,37 @@ index 0f17fad..a17ce66 100644
        ctx = ssl_server_context_get(client->set, client->ssl_set);
        SSL_set_SSL_CTX(ssl, ctx->ctx);
  }
+>From 066edb5e5c14a05c90e9ae63f0b76fcfd9c1149e Mon Sep 17 00:00:00 2001
+From: Aki Tuomi <aki.tuomi@dovecot.fi>
+Date: Thu, 20 Oct 2016 16:06:27 +0300
+Subject: [PATCH] login-common: Include local_name in login_var_expand_table
+
+This way it can be used in login_log_format
+---
+ src/login-common/client-common.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
+index d0a9c52..5964ec9 100644
+--- a/src/login-common/client-common.c
++++ b/src/login-common/client-common.c
+@@ -507,6 +507,7 @@ static struct var_expand_table login_var_expand_empty_tab[] = {
+       { '\0', NULL, "auth_username" },
+       { '\0', NULL, "auth_domain" },
+       { '\0', NULL, "listener" },
++      { '\0', NULL, "local_name" },
+       { '\0', NULL, NULL }
+ };
+ 
+@@ -581,6 +582,7 @@ get_var_expand_table(struct client *client)
+               tab[24].value = tab[21].value;
+       }
+       tab[25].value = client->listener_name;
++      tab[26].value = client->local_name == NULL ? "" : client->local_name;
+       return tab;
+ }
+ 
+-- 
+2.7.4
+
+

diff --git a/dovecot.spec b/dovecot.spec
index 51a8c653349b7cf058a3d9672ae6e30f6d99adbb..733be18ee396ea18f6b30fb0ad749f65f0735a4c 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -12,7 +12,7 @@ Summary:      IMAP and POP3 server written with security primarily in mind
 Summary(pl.UTF-8):     Serwer IMAP i POP3 pisany głównie z myślą o bezpieczeństwie
 Name:          dovecot
 Version:       2.2.25
-Release:       3
+Release:       4
 Epoch:         1
 License:       MIT (libraries), LGPL v2.1 (the rest)
 Group:         Networking/Daemons