Description: 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 . I updated it for Debian's 2.2.5 package. Author: Jaldhar H. Vyas Last-Update: Sun, 08 Sep 2013 01:23:19 -0400 --- configure.ac | 7 ++++++- src/config/all-settings.c | 4 ++-- src/lmtp/lmtp-settings.c | 2 +- src/login-common/login-settings.c | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 1bb04d7..16d373a 100644 --- a/configure.ac +++ b/configure.ac @@ -293,7 +293,12 @@ AC_C_INLINE AC_PROG_LIBTOOL AM_ICONV -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 a9fc655..96de34b 100644 --- a/src/config/all-settings.c +++ b/src/config/all-settings.c @@ -2512,7 +2512,7 @@ static const struct setting_define login_setting_defines[] = { }; static const struct login_settings login_default_settings = { .login_trusted_networks = "", - .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 = "", @@ -2638,7 +2638,7 @@ static const struct lmtp_settings lmtp_default_settings = { .lmtp_save_to_detail_mailbox = FALSE, .lmtp_rcpt_check_quota = FALSE, .lmtp_address_translate = "", - .login_greeting = PACKAGE_NAME" ready.", + .login_greeting = DOVECOT_NAME" ready.", .login_trusted_networks = "" }; static const struct setting_parser_info *lmtp_setting_dependencies[] = { diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c index a2d838a..285296b 100644 --- a/src/lmtp/lmtp-settings.c +++ b/src/lmtp/lmtp-settings.c @@ -72,7 +72,7 @@ static const struct lmtp_settings lmtp_default_settings = { .lmtp_save_to_detail_mailbox = FALSE, .lmtp_rcpt_check_quota = FALSE, .lmtp_address_translate = "", - .login_greeting = PACKAGE_NAME" ready.", + .login_greeting = DOVECOT_NAME" ready.", .login_trusted_networks = "" }; diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c index 7cc7d1b..6c8c303 100644 --- a/src/login-common/login-settings.c +++ b/src/login-common/login-settings.c @@ -45,7 +45,7 @@ static const struct setting_define login_setting_defines[] = { static const struct login_settings login_default_settings = { .login_trusted_networks = "", - .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 = "",