From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 22D808F1A for ; Wed, 30 Mar 2022 14:32:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 16BCA86DB for ; Wed, 30 Mar 2022 14:32:27 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9BE5686D2 for ; Wed, 30 Mar 2022 14:32:26 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6BC7143529 for ; Wed, 30 Mar 2022 14:32:26 +0200 (CEST) From: Markus Frank To: pmg-devel@lists.proxmox.com Date: Wed, 30 Mar 2022 14:32:14 +0200 Message-Id: <20220330123215.41926-1-m.frank@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.001 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pmg-devel] [PATCH pmg-api v2 1/2] removed SMTP from regex X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Mar 2022 12:32:57 -0000 removed "SMTP" because of lowercase function is called before. Signed-off-by: Markus Frank --- src/PMG/LDAPCache.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PMG/LDAPCache.pm b/src/PMG/LDAPCache.pm index df61454..19e22a4 100755 --- a/src/PMG/LDAPCache.pm +++ b/src/PMG/LDAPCache.pm @@ -160,11 +160,11 @@ sub queryusers { foreach my $mail (@{$user->{attributes}->{$attr}}) { $mail = lc($mail); # Test if the Line starts with one of the following lines: - # proxyAddresses: [smtp|SMTP]: + # proxyAddresses: [smtp]: # and also discard this starting string, so that $mail is only the # address without any other characters... - $mail =~ s/^(smtp|SMTP)[\:\$]//gs; + $mail =~ s/^smtp[\:\$]//gs; if ($mail !~ m/[\{\}\\\/]/ && $mail =~ m/^\S+\@\S+$/) { $umails->{$mail} = 1; -- 2.30.2