[Pkg-wmaker-commits] [wmbiff] 02/14: Prefer "imaps" instead of "sslimap" (sslimap is still supported, but imaps is documented, and a better name).

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_3_4
in repository wmbiff.

commit ca19bad071a644117e6e0913668f3916c2992906
Author: bluehal <bluehal>
Date:   Fri Nov 2 08:53:55 2001 +0000

    Prefer "imaps" instead of "sslimap" (sslimap is still supported,
    but imaps is documented, and a better name).
---
 wmbiff/Imap4Client.c | 6 +++---
 wmbiff/wmbiff.c      | 8 ++++----
 wmbiff/wmbiffrc.5    | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/wmbiff/Imap4Client.c b/wmbiff/Imap4Client.c
index 85f3de6..c112421 100644
--- a/wmbiff/Imap4Client.c
+++ b/wmbiff/Imap4Client.c
@@ -281,11 +281,11 @@ int imap4Create(Pop3 pc, const char *const str)
 	struct re_registers regs;
 	const char *errstr;
 	const char *regex =
-		".*imap:([^:]+):([^@]+)@([^/:]+)(/[^:]+)?(:[0-9]+)?";
+		".*imaps?:([^:]+):([^@]+)@([^/:]+)(/[^:]+)?(:[0-9]+)?";
 
 	/* IMAP4 format: imap:user:password at server/mailbox[:port] */
 	/* If 'str' line is badly formatted, wmbiff won't display the mailbox. */
-	if (strncmp("ssl", str, 3) == 0) {
+	if (strncmp("sslimap:", str, 8) == 0 || strncmp("imaps:", str, 6) == 0) {
 #ifdef WITH_TLS
 		static int haveBeenWarned;
 		PCU.dossl = 1;
@@ -299,7 +299,7 @@ int imap4Create(Pop3 pc, const char *const str)
 		}
 #else
 		printf("This copy of wmbiff was not compiled with gnutls;\n"
-			   "sslimap is unavailable.  Exiting to protect your\n"
+			   "imaps is unavailable.  Exiting to protect your\n"
 			   "passwords and privacy.\n");
 		exit(EXIT_FAILURE);
 #endif
diff --git a/wmbiff/wmbiff.c b/wmbiff/wmbiff.c
index df37de7..ce8f3a5 100644
--- a/wmbiff/wmbiff.c
+++ b/wmbiff/wmbiff.c
@@ -1,4 +1,4 @@
-/* $Id: wmbiff.c,v 1.9 2001/10/29 13:54:00 jordi Exp $ */
+/* $Id: wmbiff.c,v 1.10 2001/11/02 08:53:55 bluehal Exp $ */
 
 #define	USE_POLL
 
@@ -488,9 +488,9 @@ void parse_mbox_path(int item)
 		pop3Create((&mbox[item]), mbox[item].path);
 	} else if (!strncasecmp(mbox[item].path, "licq:", 5)) {	/* licq history file */
 		licqCreate((&mbox[item]), mbox[item].path);
-	} else if (!strncasecmp(mbox[item].path, "imap:", 5)) {	/* imap4 account */
-		imap4Create((&mbox[item]), mbox[item].path);
-	} else if (!strncasecmp(mbox[item].path, "sslimap:", 8)) {	/* sslimap4 account */
+	} else if (!strncasecmp(mbox[item].path, "imap:", 5) ||	/* imap4 account */
+			   !strncasecmp(mbox[item].path, "sslimap:", 8) ||	/* sslimap4 account */
+			   !strncasecmp(mbox[item].path, "imaps:", 6)) {	/* sslimap4 account */
 		imap4Create((&mbox[item]), mbox[item].path);
 	} else if (!strncasecmp(mbox[item].path, "maildir:", 8)) {	/* maildir */
 		maildirCreate((&mbox[item]), mbox[item].path);
diff --git a/wmbiff/wmbiffrc.5 b/wmbiff/wmbiffrc.5
index 0f8b563..7e3526d 100644
--- a/wmbiff/wmbiffrc.5
+++ b/wmbiff/wmbiffrc.5
@@ -1,5 +1,5 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
-.\" $Id: wmbiffrc.5,v 1.5 2001/10/04 09:50:59 jordi Exp $
+.\" $Id: wmbiffrc.5,v 1.6 2001/11/02 08:53:55 bluehal Exp $
 .\"
 .\" wmbiff.1 and wmbiffrc.5 are copyright 1999-2001 by 
 .\" Jordi Mallach <jordi at debian.org>
@@ -77,7 +77,7 @@ accepts user, password, host and optional path to mailbox and port number.
 imap:user:password at server[/mailbox][:port]
 .RE
 .TP
-.I sslimap
+.I imaps
 These are IMAP4 boxes wrapped in a TLS (SSL) connection, only available if 
 wmbiff was compiled with TLS support.  Parameters are the same as those for 
 ordinary IMAP4 boxes.  Port defaults to 993. If 143 is specified, 
@@ -86,7 +86,7 @@ IMAP's STARTTLS command.  TLS support uses gnutls, which is under development
 and may be insecure.  TLS support is only for encryption: since certificates
 are not yet checked, it is vulnerable to man-in-the-middle attack.
 .RS
-sslimap:user:password at server[/mailbox][:port]
+imaps:user:password at server[/mailbox][:port]
 .RE
 .TP
 .I licq

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git