Fixed argument parsing and SMB API

diff --git a/helpers/basic_auth/MSNT/msntauth.cc b/helpers/basic_auth/MSNT/msntauth.cc
index 5e09d0596af2303e1aa656540091ac93ad9939ce..69ee0cf6c6a7bca94993948677de33bde1e9926e 100644 (file)
--- a/helpers/basic_auth/MSNT/msntauth.cc
+++ b/helpers/basic_auth/MSNT/msntauth.cc
@@ -64,7 +64,8 @@ bool
 validate_user(char *username, char *password)
 {
        for (domaincontroller dc : domaincontrollers) {
-               if (Valid_User(username, password, dc.server.c_str(), dc.domain.c_str()))
+           int rv = Valid_User(username, password, dc.server.c_str(), dc.domain.c_str());
+               if (rv == NTV_NO_ERROR)
                        return true;
        }
        return false;
@@ -84,7 +85,7 @@ main(int argc, char **argv)
     for (int j = 1; j < argc; ++j) {
        std::string arg = argv[j];
        size_t pos=arg.find('/');
-       if (arg.find('/',pos+1)) {
+       if (arg.find('/',pos+1) != std::string::npos) {
                std::cerr << "Error: can't understand domain controller specification '"
                                << arg << '"' << std::endl;
                exit(1);

diff --git a/helpers/basic_auth/MSNT/valid.cc b/helpers/basic_auth/MSNT/valid.cc
index 4759681b83a401a332129dec573b09e9b467b619..b4659366f0b3dae412e27a564fe8391be35efddc 100644 (file)
--- a/helpers/basic_auth/MSNT/valid.cc
+++ b/helpers/basic_auth/MSNT/valid.cc
@@ -20,7 +20,7 @@
 #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, const char *DOMAIN)
 {
     const char *supportedDialects[] = {"PC NETWORK PROGRAM 1.0",
                                        "MICchecROSOFT NETWORKS 1.03",
@@ -43,7 +43,7 @@ Valid_User(char *USERNAME, char *PASSWORD, const char *SERVER, const char *DOMAI
         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);
     }