From 5ad95abd711a7a0a619246fd2bb4a7cfe60acc1b Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Thu, 26 Sep 1996 15:57:33 +0000
Subject: No more rpopid field.

svn path=/trunk/; revision=162
---
 pop3.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'pop3.c')

diff --git a/pop3.c b/pop3.c
index 2c5ad87e..7a9c3ccc 100644
--- a/pop3.c
+++ b/pop3.c
@@ -104,10 +104,17 @@ char *greeting;
 	if (pop3_ok(buf,socket) != 0)
 	    goto badAuth;
 
-	if (queryctl->rpopid[0])
-	    gen_send(socket, "RPOP %s", queryctl->rpopid);
-	else
-	    gen_send(socket, "PASS %s", queryctl->password);
+	gen_send(socket, "PASS %s", queryctl->password);
+	if (pop3_ok(buf,socket) != 0)
+	    goto badAuth;
+	break;
+
+    case P_RPOP:
+	gen_send(socket,"USER %s", queryctl->remotename);
+	if (pop3_ok(buf,socket) != 0)
+	    goto badAuth;
+
+	gen_send(socket, "RPOP %s", queryctl->password);
 	if (pop3_ok(buf,socket) != 0)
 	    goto badAuth;
 	break;
-- 
cgit v1.2.3