aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/upas
diff options
context:
space:
mode:
authorRuss Cox <rsc@swtch.com>2010-05-11 08:25:08 -0700
committerRuss Cox <rsc@swtch.com>2010-05-11 08:25:08 -0700
commit18ee9a80f1a2f0e95982a90e40fd052fdae1c2c9 (patch)
treea7b9e8c40eb54217ca42b70591538007075d7321 /src/cmd/upas
parente18f0a49f386aacee21c44d21e21d5c37a0e153e (diff)
downloadplan9port-18ee9a80f1a2f0e95982a90e40fd052fdae1c2c9.tar.gz
plan9port-18ee9a80f1a2f0e95982a90e40fd052fdae1c2c9.tar.bz2
plan9port-18ee9a80f1a2f0e95982a90e40fd052fdae1c2c9.zip
mailfs: try tlsclient program before stunnel
R=rsc http://codereview.appspot.com/1169043
Diffstat (limited to 'src/cmd/upas')
-rw-r--r--src/cmd/upas/nfs/imap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cmd/upas/nfs/imap.c b/src/cmd/upas/nfs/imap.c
index 757bf0ba..2af3a124 100644
--- a/src/cmd/upas/nfs/imap.c
+++ b/src/cmd/upas/nfs/imap.c
@@ -755,7 +755,8 @@ imapdial(char *server, int mode)
fd[1] = dup(p[0], -1);
fd[2] = dup(2, -1);
tmp = esmprint("%s:993", server);
- if(threadspawnl(fd, "/usr/sbin/stunnel", "stunnel", "-c", "-r", tmp, nil) < 0
+ if(threadspawnl(fd, "tlsclient", "tlsclient", tmp, nil) < 0
+ && threadspawnl(fd, "/usr/sbin/stunnel", "stunnel", "-c", "-r", tmp, nil) < 0
&& threadspawnl(fd, "/usr/bin/stunnel", "stunnel", "-c", "-r", tmp, nil) < 0){
free(tmp);
close(p[0]);