From: Jaldhar H. Vyas <jaldhar@debian.org>
Date: Sat, 7 Sep 2013 05:16:14 +0000 (-0400)
Subject: Update Dovecot name to include Distribution in login greeting message
X-Git-Tag: archive/raspbian/1%2.3.21.1+dfsg1-1+rpi1~1^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f57bb1a8fcfaeec1057850712a0063b26e1f5d22;p=dovecot.git

Update Dovecot name to include Distribution in login greeting message

This patch was found at: https://blueprints.launchpad.net/ubuntu/+spec/servercloud-s-server-app-banner-updates
and originally provided by Ubuntu for their 2.1.7 package.  The original
author is  Yolanda Robla <yolanda.robla@canonical.com>.  I updated it
for Debian's 2.2.5 package.

Last-Update: 2020-05-23

Gbp-Pq: Name dovecot_name.patch
---

diff --git a/configure.ac b/configure.ac
index a92b99b..8ef3073 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,7 +287,12 @@ AM_ICONV
 # SIZE_MAX is missing without this
 CXXFLAGS="$CXXFLAGS -D__STDC_LIMIT_MACROS"
 
-AC_DEFINE_UNQUOTED(DOVECOT_NAME, "$PACKAGE_NAME", [Dovecot name])
+if test -x /usr/bin/lsb_release && lsb_release -si; then
+    DOVECOT_DISTRIBUTION=" ($(lsb_release -si))"
+else
+    DOVECOT_DISTRIBUTION=""
+fi
+AC_DEFINE_UNQUOTED(DOVECOT_NAME, "$PACKAGE_NAME$DOVECOT_DISTRIBUTION", [Dovecot name])
 AC_DEFINE_UNQUOTED(DOVECOT_STRING, "$PACKAGE_STRING", [Dovecot string])
 AC_DEFINE_UNQUOTED(DOVECOT_VERSION, "$PACKAGE_VERSION", [Dovecot version])
 
diff --git a/src/config/all-settings.c b/src/config/all-settings.c
index 0ee46fd..d62b45c 100644
--- a/src/config/all-settings.c
+++ b/src/config/all-settings.c
@@ -2324,7 +2324,7 @@ static const struct submission_settings submission_default_settings = {
 
 	.hostname = "",
 
-	.login_greeting = PACKAGE_NAME" ready.",
+	.login_greeting = DOVECOT_NAME" ready.",
 	.login_trusted_networks = "",
 
 	.recipient_delimiter = "+",
@@ -4188,7 +4188,7 @@ static const struct setting_define login_setting_defines[] = {
 static const struct login_settings login_default_settings = {
 	.login_trusted_networks = "",
 	.login_source_ips = "",
-	.login_greeting = PACKAGE_NAME" ready.",
+	.login_greeting = DOVECOT_NAME" ready.",
 	.login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c session=<%{session}>",
 	.login_log_format = "%$: %s",
 	.login_access_sockets = "",
@@ -4402,7 +4402,7 @@ static const struct lmtp_settings lmtp_default_settings = {
 
 	.lmtp_client_workarounds = "",
 
-	.login_greeting = PACKAGE_NAME" ready.",
+	.login_greeting = DOVECOT_NAME" ready.",
 	.login_trusted_networks = "",
 
 	.mail_plugins = "",
diff --git a/src/lib-smtp/smtp-server.c b/src/lib-smtp/smtp-server.c
index e0afde3..bb1eb84 100644
--- a/src/lib-smtp/smtp-server.c
+++ b/src/lib-smtp/smtp-server.c
@@ -49,7 +49,7 @@ struct smtp_server *smtp_server_init(const struct smtp_server_settings *set)
 	if (set->login_greeting != NULL && *set->login_greeting != '\0')
 		server->set.login_greeting = p_strdup(pool, set->login_greeting);
 	else
-		server->set.login_greeting = PACKAGE_NAME" ready.";
+		server->set.login_greeting = DOVECOT_NAME" ready.";
 	if (set->capabilities == 0) {
 		server->set.capabilities = SMTP_SERVER_DEFAULT_CAPABILITIES;
 	} else  {
diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c
index 1d9ecb2..cb4b0e7 100644
--- a/src/lmtp/lmtp-settings.c
+++ b/src/lmtp/lmtp-settings.c
@@ -93,7 +93,7 @@ static const struct lmtp_settings lmtp_default_settings = {
 
 	.lmtp_client_workarounds = "",
 
-	.login_greeting = PACKAGE_NAME" ready.",
+	.login_greeting = DOVECOT_NAME" ready.",
 	.login_trusted_networks = "",
 
 	.mail_plugins = "",
diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c
index e680677..0dd4e58 100644
--- a/src/login-common/login-settings.c
+++ b/src/login-common/login-settings.c
@@ -51,7 +51,7 @@ static const struct setting_define login_setting_defines[] = {
 static const struct login_settings login_default_settings = {
 	.login_trusted_networks = "",
 	.login_source_ips = "",
-	.login_greeting = PACKAGE_NAME" ready.",
+	.login_greeting = DOVECOT_NAME" ready.",
 	.login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c session=<%{session}>",
 	.login_log_format = "%$: %s",
 	.login_access_sockets = "",
diff --git a/src/submission/submission-settings.c b/src/submission/submission-settings.c
index 6764b3d..1e7290e 100644
--- a/src/submission/submission-settings.c
+++ b/src/submission/submission-settings.c
@@ -103,7 +103,7 @@ static const struct submission_settings submission_default_settings = {
 
 	.hostname = "",
 
-	.login_greeting = PACKAGE_NAME" ready.",
+	.login_greeting = DOVECOT_NAME" ready.",
 	.login_trusted_networks = "",
 
 	.recipient_delimiter = "+",