From 1d01997eee5e72efcdd61f19f42a139addeac1af Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Nov 26 2019 12:01:59 +0000 Subject: Document CC_TO in warquota.conf is looked up with LDAP --- diff --git a/quota-4.04-warnquota-Clarify-that-CC_TO-gets-resolved-through-L.patch b/quota-4.04-warnquota-Clarify-that-CC_TO-gets-resolved-through-L.patch new file mode 100644 index 0000000..4720794 --- /dev/null +++ b/quota-4.04-warnquota-Clarify-that-CC_TO-gets-resolved-through-L.patch @@ -0,0 +1,35 @@ +From c4340665cebf1025097c490e47223361cac4746d Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Thu, 12 Sep 2019 10:18:01 +0200 +Subject: [PATCH] warnquota: Clarify that CC_TO gets resolved through LDAP +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Clarify that CC_TO field from warnquota.conf gets resolved through LDAP +lookup similarly to normal message recifient. + +Signed-off-by: Jan Kara +Petr Písař: Ported to 4.04 from +769f46743d11a4723ef59b018cef0aa6b6c062a6. +Signed-off-by: Petr Písař +--- + warnquota.conf | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/warnquota.conf b/warnquota.conf +index 7e00947..34bfe53 100644 +--- a/warnquota.conf ++++ b/warnquota.conf +@@ -8,6 +8,8 @@ MAIL_CMD = "/usr/sbin/sendmail -t" + FROM = "root@example.com" + # but they don't have to be: + SUBJECT = NOTE: You are exceeding your allocated disk space limits ++# Note that if LDAP is configured, the name in CC_TO gets looked up in LDAP ++# to obtain email address similarly to email recipient address. + CC_TO = "root@example.com" + # If you set this variable CC will be used only when user has less than + # specified grace time left (examples of possible times: 5 seconds, 1 minute, +-- +2.21.0 + diff --git a/quota.spec b/quota.spec index d5f9b21..5ad4dbe 100644 --- a/quota.spec +++ b/quota.spec @@ -104,6 +104,9 @@ Patch19: quota-4.05-warnquota-Print-also-additional-error-info-for-LDAP-.patch # 2/2 Report detailed LDAP failures, proposed to the upstream, # Patch20: quota-4.05-warnquota-Free-LDAP-error-message.patch +# Document CC_TO in warquota.conf is looked up with LDAP, +# in upstream after 4.05 +Patch21: quota-4.04-warnquota-Clarify-that-CC_TO-gets-resolved-through-L.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bash @@ -238,6 +241,7 @@ Linux/UNIX environment. %patch18 -p1 %patch19 -p1 %patch20 -p1 +%patch21 -p1 # Regenerate build scripts autoreconf -f -i @@ -386,6 +390,7 @@ make check - Fix warnquota --help output - Fix checking for the LDAP failures in the warnquota tool - Report detailed LDAP failures +- Document CC_TO in warquota.conf is looked up with LDAP * Tue Apr 02 2019 Petr Pisar - 1:4.04-12 - Fix warnquota CC field when using LDAP