465 now default instead of 587

4 files changed, 6 insertions, 6 deletions

diff --git a/README.md b/README.md
index 2aee255..a19170b 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ The mutt-wizard runs via the command `mw`. Once setup is complete, you'll use
 - `-i` -- IMAP server address
 - `-I` -- IMAP server port (otherwise assumed to be 993)
 - `-s` -- SMTP server address
-- `-S` -- SMTP server port (otherwise assumed to be 587)
+- `-S` -- SMTP server port (otherwise assumed to be 465)
 - `-m` -- Maximum number of emails to be kept offline. No maximum is default
   functionality.
 - `-x` -- Account password. You will be prompted for it otherwise.
diff --git a/bin/mw b/bin/mw
index 051bf54..8adb0b9 100755
--- a/bin/mw
+++ b/bin/mw
@@ -40,7 +40,7 @@ list() { getaccounts && [ -n "$accounts" ] && echo "$accounts" || exit 1 ;}
 
 prepmsmtp() { echo "account $fulladdr
 host $smtp
-port ${sport:-587}
+port ${sport:-465}
 from $fulladdr
 user $login
 passwordeval \"pass $fulladdr\"
@@ -48,7 +48,7 @@ auth ${auth:-on}
 tls on
 tls_trust_file	$sslcert
 logfile $msmtplog
-$tlsline
+${tlsline:-tls_starttls off}
 " >> "$msmtprc"
 }
 
@@ -193,7 +193,7 @@ askinfo() { \
 		read -r imap
 	[ -z "$smtp" ] && echo "Give your email server's SMTP address (excluding the port number):" &&
 		read -r smtp
-	[ "$sport" = 465 ] && tlsline="tls_starttls off"
+	[ "$sport" = 587 ] && tlsline="# tls_starttls"
 	[ -z "$realname" ] && realname="${fulladdr%%@*}"
 	hostname="$(echo "$fulladdr" | cut -d @ -f 2)"
 	login="${login:-$fulladdr}"
diff --git a/mw.1 b/mw.1
index 26d9569..a8c5c8e 100644
--- a/mw.1
+++ b/mw.1
@@ -63,7 +63,7 @@ IMAP/POP server port (assumed to be 993 for IMAP and 995 for POP if not specifie
 SMTP server address
 .TP
 .B -S
-SMTP server port (assumed to be 587 if not specified)
+SMTP server port (assumed to be 465 if not specified)
 .TP
 .B -x
 Account password. You will be prompted for the password interactively if this option is not given.
diff --git a/share/domains.csv b/share/domains.csv
index e307b22..854d383 100644
--- a/share/domains.csv
+++ b/share/domains.csv
@@ -160,7 +160,7 @@ live.rhul.ac.uk,outlook.office365.com,993,smtp.office365.com,587
 logorroici.org,mail.autistici.org,993,smtp.autistici.org,465
 loves.dicksinhisan.us,mail.cock.li,993,mail.cock.li,587
 loves.dicksinmyan.us,mail.cock.li,993,mail.cock.li,587
-lukesmith.xyz,mail.lukesmith.xyz,993,mail.lukesmith.xyz,587
+lukesmith.xyz,mail.lukesmith.xyz,993,mail.lukesmith.xyz,465
 luther.edu,imap.gmail.com,993,smtp.gmail.com,587
 mac.com,imap.mail.me.com,993,smtp.mail.me.com,587
 mace.ac.in,imap.gmail.com,993,smtp.gmail.com,587