1 files changed, 13 insertions, 7 deletions
diff --git a/common/rfb/SSecurityPlain.h b/common/rfb/SSecurityPlain.h
index c0ac049b..4c030455 100644
--- a/common/rfb/SSecurityPlain.h
+++ b/common/rfb/SSecurityPlain.h
@@ -20,23 +20,29 @@
 #ifndef __RFB_SSECURITYPLAIN_H__
 #define __RFB_SSECURITYPLAIN_H__
 
-#include <rfb/SConnection.h>
+#include <rfb/Security.h>
 #include <rfb/SSecurity.h>
-#include <rfb/SSecurityVeNCrypt.h>
-#include <rfb/Configuration.h>
+
+namespace core { class StringListParameter; }
 
 namespace rfb {
 
   class PasswordValidator {
   public:
-    bool validate(SConnection* sc, const char *username, const char *password)
-      { return validUser(username) ? validateInternal(sc, username, password) : false; }
-    static StringParameter plainUsers;
+    bool validate(SConnection* sc,
+                  const char *username,
+                  const char *password,
+                  std::string &msg)
+      { return validUser(username) ? validateInternal(sc, username, password, msg) : false; }
+    static core::StringListParameter plainUsers;
 
     virtual ~PasswordValidator() { }
 
   protected:
-    virtual bool validateInternal(SConnection* sc, const char *username, const char *password)=0;
+    virtual bool validateInternal(SConnection* sc,
+                                  const char *username,
+                                  const char *password,
+                                  std::string &msg) = 0;
     static bool validUser(const char* username);
   };