Reverted most changes to valid_user.cc

diff --git a/helpers/basic_auth/MSNT/msntauth.cc b/helpers/basic_auth/MSNT/msntauth.cc
index 67cf317aa9c45a26e5d85f1608cf9e40465d115e..6624c2f237d7853ee4fb3061b943280474e0c153 100644 (file)
--- a/helpers/basic_auth/MSNT/msntauth.cc
+++ b/helpers/basic_auth/MSNT/msntauth.cc
@@ -65,7 +65,7 @@ validate_user(char *username, char *password)
 {
        for (domaincontroller dc : domaincontrollers) {
                std::cerr << "testing against " << dc.server << std::endl;
-               const int rv = Valid_User(username, password, dc.server.c_str(), dc.domain.c_str());
+               const int rv = Valid_User(username, password, dc.server.c_str(), NULL, dc.domain.c_str());
                std::cerr << "check result: " << rv << std::endl;
                if (rv == NTV_NO_ERROR)
                        return true;

diff --git a/helpers/basic_auth/MSNT/valid.cc b/helpers/basic_auth/MSNT/valid.cc
index b4659366f0b3dae412e27a564fe8391be35efddc..a4a64a6e597aa2c9938209e0f039648cd9f5e59c 100644 (file)
--- a/helpers/basic_auth/MSNT/valid.cc
+++ b/helpers/basic_auth/MSNT/valid.cc
@@ -20,10 +20,10 @@
 #include "valid.h"
 
 int
-Valid_User(char *username, char *password, const char *SERVER, const char *DOMAIN)
+Valid_User(char *USERNAME, char *PASSWORD, const char *SERVER, char *BACKUP, const char *DOMAIN)
 {
     const char *supportedDialects[] = {"PC NETWORK PROGRAM 1.0",
-                                       "MICchecROSOFT NETWORKS 1.03",
+                                       "MICROSOFT NETWORKS 1.03",
                                        "MICROSOFT NETWORKS 3.0",
                                        "LANMAN1.0",
                                        "LM1.2X002",
@@ -36,14 +36,17 @@ Valid_User(char *username, char *password, const char *SERVER, const char *DOMAI
 
     SMB_Init();
     con = SMB_Connect_Server(NULL, SERVER, DOMAIN);
-    if (con == NULL)
-       return (NTV_SERVER_ERROR);
-
+    if (con == NULL) {         /* Error ... */
+        con = SMB_Connect_Server(NULL, BACKUP, DOMAIN);
+        if (con == NULL) {
+            return (NTV_SERVER_ERROR);
+        }
+    }
     if (SMB_Negotiate(con, supportedDialects) < 0) {   /* An error */
         SMB_Discon(con, 0);
         return (NTV_PROTOCOL_ERROR);
     }
-    if (SMB_Logon_Server(con, username, password, NULL, 0) < 0) {
+    if (SMB_Logon_Server(con, USERNAME, PASSWORD, NULL, 0) < 0) {
         SMB_Discon(con, 0);
         return (NTV_LOGON_ERROR);
     }

diff --git a/helpers/basic_auth/MSNT/valid.h b/helpers/basic_auth/MSNT/valid.h
index 1a2d586eb2b419506e62d46600a31b6f541b52f4..40ca4820a5c87df879c26622e3f6cc3bfd9fb7a5 100644 (file)
--- a/helpers/basic_auth/MSNT/valid.h
+++ b/helpers/basic_auth/MSNT/valid.h
@@ -15,6 +15,6 @@
 #define NTV_PROTOCOL_ERROR 2
 #define NTV_LOGON_ERROR 3
 
-int Valid_User(char *USERNAME, char *PASSWORD, const char *SERVER, const char *DOMAIN);
+int Valid_User(char *USERNAME, char *PASSWORD, const char *SERVER, char *BACKUP, const char *DOMAIN);
 
 #endif