michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow : in sasl password https://sourceforge.net/p/webadmin/bugs/5178/

Browse Source
This commit is contained in:
Jamie Cameron
2018-08-15 22:58:12 -07:00
parent 3ba0297064
commit c1affd6a44
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
postfix/lang/en
View File

@@ -846,8 +846,8 @@ sasl_level_secure=Secure-channel TLS
sasl_login=SMTP login to outgoing mail host
sasl_nologin=None needed
sasl_userpass=Login as $1 with password $2
sasl_elogin=Missing or invalid SMTP login
sasl_epass=Invalid SMTP password
sasl_elogin=Missing or invalid SMTP login (no spaces or colons allowed)
sasl_epass=Invalid SMTP password (no spaces allowed)
client_title=SMTP Client Restrictions
client_ecannot=You are not allowed to edit SMTP client restrictions

2
postfix/sasl.cgi
View File

@@ -88,7 +88,7 @@ if ($rh) {
$pmap = &get_maps("smtp_sasl_password_maps");
foreach my $o (@$pmap) {
if ($o->{'name'} eq $rh) {
($ruser, $rpass) = split(/:/, $o->{'value'});
($ruser, $rpass) = split(/:/, $o->{'value'}, 2);
}
}
}

2
postfix/save_sasl.cgi
View File

@@ -23,7 +23,7 @@ if ($in{'smtpd_tls_CAfile_def'} eq "__USE_FREE_FIELD__") {
# Validate remote mail server login
if (!$in{'login_none'}) {
$in{'login_user'} =~ /^[^: ]+$/ || &error($text{'sasl_elogin'});
$in{'login_pass'} =~ /^[^: ]*$/ || &error($text{'sasl_epass'});
$in{'login_pass'} =~ /^[^ ]*$/ || &error($text{'sasl_epass'});
}
&lock_postfix_files();