From b5e27f8f8cafa23cf46727422411b401023e1a13 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sat, 27 Dec 2014 21:47:53 +0100 Subject: [PATCH] Reverted most changes to valid_user.cc --- helpers/basic_auth/MSNT/msntauth.cc | 2 +- helpers/basic_auth/MSNT/valid.cc | 15 +++++++++------ helpers/basic_auth/MSNT/valid.h | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/helpers/basic_auth/MSNT/msntauth.cc b/helpers/basic_auth/MSNT/msntauth.cc index 67cf317aa9..6624c2f237 100644 --- 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 b4659366f0..a4a64a6e59 100644 --- 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 1a2d586eb2..40ca4820a5 100644 --- 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 -- 2.47.2