exclude --remote from POP3.

svn path=/trunk/; revision=88

2 files changed, 7 insertions, 1 deletions

diff --git a/fetchmail.man b/fetchmail.man
index f6dd6340..8ec701c5 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -558,7 +558,8 @@ are not rewritten to enable replies as described under --norewrite.
 This isn't a protocol problem, it's because the developer couldn't
 find a POP2 server to test the necessary code reorganization with.
 .PP
-The --remotefolder option doesn't work with POP3.
+The --remotefolder option doesn't work with POP3, the protocol won't
+support it.
 .PP
 The UIDL support for RFC1725-compliant servers without LAST is not yet
 very well tested.
diff --git a/pop3.c b/pop3.c
index b386deb3..6bc3fac7 100644
--- a/pop3.c
+++ b/pop3.c
@@ -258,6 +258,11 @@ int doPOP3bis (queryctl)
 /* retrieve messages using POP3 */
 struct hostrec *queryctl;
 {
+    if (queryctl->remotefolder[0]) {
+	fprintf(stderr,"Option --remote is not supported with POP3\n");
+	return(PS_SYNTAX);
+    }
+
     return(do_protocol(queryctl, &pop3));
 }