1) when no domain used in ntlogin test command, should use default one

[kai/samba.git] / source3 / rpc_client / cli_use.c

diff --git a/source3/rpc_client/cli_use.c b/source3/rpc_client/cli_use.c
index a2559fbaabf7d61d32883396bb412c0c11d88c47..a953d332e1ecd1db4ad6895ae75d2be98a6556df 100644 (file)
--- a/source3/rpc_client/cli_use.c
+++ b/source3/rpc_client/cli_use.c
@@ -113,29 +113,49 @@ static struct cli_use *cli_find(const char* srv_name,
                sv_name = &sv_name[2];
        }
 
+       DEBUG(10,("cli_find: %s %s %s\n",
+                       srv_name,
+                       usr_creds->user_name,
+                       usr_creds->domain));
+
        for (i = 0; i < num_clis; i++)
        {
-               uchar ntpw[16], clintpw[16];
                char *cli_name = NULL;
+               struct cli_use *c = clis[i];
 
-               if (clis[i] == NULL) continue;
+               if (c == NULL) continue;
 
-               cli_name = clis[i]->cli->desthost;
+               cli_name = c->cli->desthost;
+
+               DEBUG(10,("cli_find[%d]: %s %s %s\n",
+                               i, cli_name,
+                               c->cli->usr.user_name,
+                               c->cli->usr.domain));
+                               
                if (strnequal("\\\\", cli_name, 2))
                {
                        cli_name = &cli_name[2];
                }
 
-               if (!strequal(cli_name, sv_name)) continue;
-
-               pwd_get_lm_nt_16(&usr_creds->pwd, NULL, ntpw);
-               pwd_get_lm_nt_16(&clis[i]->cli->usr.pwd, NULL, clintpw);
-
-               if (strequal(usr_creds->user_name, clis[i]->cli->usr.user_name) &&
-                   strequal(usr_creds->domain, clis[i]->cli->usr.domain) &&
-                   memcmp(ntpw, clintpw, 16) == 0)
+               if (!strequal(cli_name, sv_name))
                {
-                       return clis[i];
+                       continue;
+               }
+               if (!strequal(usr_creds->user_name, c->cli->usr.user_name))
+               {
+                       continue;
+               }
+               if (!pwd_compare(&usr_creds->pwd, &c->cli->usr.pwd))
+               {
+                       continue;
+               }
+               if (usr_creds->domain[0] == 0)
+               {
+                       return c;
+               }
+               if (strequal(usr_creds->domain, c->cli->usr.domain))
+               {
+                       return c;
                }
        }
 
@@ -164,11 +184,8 @@ static struct cli_use *cli_use_get(const char* srv_name,
                return NULL;
        }
 
-       cli->cli->capabilities |= CAP_NT_SMBS | CAP_STATUS32;
        cli_init_creds(cli->cli, usr_creds);
 
-       cli->cli->use_ntlmv2 = lp_client_ntlmv2();
-
        return cli;
 }