upas/smtp: allow remote port to be set to something other than smtp (e.g. ssmtp)

diff --git a/sys/src/cmd/upas/smtp/mxdial.c b/sys/src/cmd/upas/smtp/mxdial.c
index 74516a030eec082ae4f3797a6a48ba498a9bd201..7a707c509990fa6e124b4d74451695a94230a4af 100644 (file)
--- a/sys/src/cmd/upas/smtp/mxdial.c
+++ b/sys/src/cmd/upas/smtp/mxdial.c
@@ -48,6 +48,8 @@ dialstringparse(char *str, DS *ds)
        ds->service = strchr(ds->host, '!');
        if(ds->service)
                *ds->service++ = 0;
+       else
+               ds->service = "smtp";
        if(*ds->host == '$')
                expand(ds);
 }
@@ -293,7 +295,6 @@ mxdial0(char *addr, char *ddomain, char *gdomain, Mxtab *mx)
 
        dprint("mxdial(%s, %s, %s, mx)\n", addr, ddomain, gdomain);
        memset(mx, 0, sizeof *mx);
-       addr = netmkaddr(addr, 0, "smtp");
        d = mx->ds;
        dialstringparse(addr, d + 0);
        nd = 1;