Support spaces in passwords for POP3, and linking problem Debian

[Stephen R. van den Berg]

>From ceacbf7b64244d33cd15a8ebcb598c289785a312 Mon Sep 17 00:00:00 2001
From: Stephen R. van den Berg <s...@cuci.nl>
Date: Wed, 20 Apr 2011 08:45:17 +0200
Subject: Support spaces in passwords.

---
 pop/pop.cpp        |    2 +-
 pop/popcommand.cpp |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pop/pop.cpp b/pop/pop.cpp
index dfda350..62b6899 100644
--- a/pop/pop.cpp
+++ b/pop/pop.cpp
@@ -319,7 +319,7 @@ void POP::parse()
                     d->sawUser = true;
                     newCommand( d->commands, this, PopCommand::User, args );
                 }
-                else if ( d->sawUser && cmd == "pass" && args->count() == 1 ) {
+                else if ( d->sawUser && cmd == "pass" && args->count() >= 1 ) {
                     d->sawUser = false;
                     newCommand( d->commands, this, PopCommand::Pass, args );
                 }
diff --git a/pop/popcommand.cpp b/pop/popcommand.cpp
index 8ad6bf8..1d18fea 100644
--- a/pop/popcommand.cpp
+++ b/pop/popcommand.cpp
@@ -331,7 +331,10 @@ bool PopCommand::pass()
         }
         d->m->setState( SaslMechanism::Authenticating );
         d->m->setLogin( d->pop->user()->login() );
-        d->m->setSecret( nextArg() );
+        EString pw=nextArg();
+        while ( d->args->count() )
+            pw += " ", pw += nextArg();
+        d->m->setSecret( pw );
         d->m->execute();
     }
 
-- 
1.7.4.1


>From 158c515b82ed2ccb45569e135ecae6cb9aa8ec8d Mon Sep 17 00:00:00 2001
From: Stephen R. van den Berg <s...@cuci.nl>
Date: Wed, 20 Apr 2011 09:05:12 +0200
Subject: Extra link dependency needed under Debian Linux

---
 server/Jamfile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/Jamfile b/server/Jamfile
index 7db47be..c1ed75b 100644
--- a/server/Jamfile
+++ b/server/Jamfile
@@ -29,5 +29,5 @@ Build server : tlsthread.cpp ;
 UseLibrary tlsthread.cpp : ssl ;
 # UseLibrary tlsthread.cpp : pthread ;
 C++FLAGS += -pthread ;
-LINKFLAGS += -pthread ;
+LINKFLAGS += -pthread -lcrypto ;
 
-- 
1.7.4.1

-- 
Stephen.

Confidence is that feeling you have before you understand the situation.