Changeset 988 for vendor/current/source3/libsmb/passchange.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/libsmb/passchange.c (modified) (15 diffs)

vendor/current/source3/libsmb/passchange.c

@@ -3 +3 @@
    SMB client password change routine
    Copyright (C) Andrew Tridgell 1994-1998
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -25 +25 @@
 #include "libsmb/clirap.h"
 #include "libsmb/nmblib.h"
+#include "../libcli/smb/smbXcli_base.h"
 
 /*************************************************************
@@ -34 +35 @@
                                 char **err_str)
 {
-        struct nmb_name calling, called;
         struct cli_state *cli = NULL;
         struct rpc_pipe_client *pipe_hnd = NULL;
-        struct sockaddr_storage ss;
         char *user, *domain, *p;
 
@@ -58 +57 @@
         *err_str = NULL;
 
-        if(!resolve_name( remote_machine, &ss, 0x20, false)) {
-                if (asprintf(err_str, "Unable to find an IP address for machine "
-                         "%s.\n", remote_machine) == -1) {
-                        *err_str = NULL;
-                }
-                return NT_STATUS_UNSUCCESSFUL;
-        }
-
-        cli = cli_initialise();
-        if (!cli) {
-                return NT_STATUS_NO_MEMORY;
-        }
-
-        result = cli_connect(cli, remote_machine, &ss);
+        result = cli_connect_nb(remote_machine, NULL, 0, 0x20, NULL,
+                                SMB_SIGNING_IPC_DEFAULT, 0, &cli);
         if (!NT_STATUS_IS_OK(result)) {
                 if (asprintf(err_str, "Unable to connect to SMB server on "
@@ -78 +65 @@
                         *err_str = NULL;
                 }
-                cli_shutdown(cli);
-                return result;
-        }
-
-        make_nmb_name(&calling, global_myname() , 0x0);
-        make_nmb_name(&called , remote_machine, 0x20);
-
-        if (!cli_session_request(cli, &calling, &called)) {
-                if (asprintf(err_str, "machine %s rejected the session setup. "
-                         "Error was : %s.\n",
-                         remote_machine, cli_errstr(cli)) == -1) {
-                        *err_str = NULL;
-                }
-                result = cli_nt_error(cli);
-                cli_shutdown(cli);
-                return result;
-        }
-
-        cli->protocol = PROTOCOL_NT1;
-
-        result = cli_negprot(cli);
+                return result;
+        }
+
+        result = smbXcli_negprot(cli->conn, cli->timeout,
+                                 lp_client_ipc_min_protocol(),
+                                 lp_client_ipc_max_protocol());
 
         if (!NT_STATUS_IS_OK(result)) {
@@ -106 +78 @@
                         *err_str = NULL;
                 }
-                result = cli_nt_error(cli);
                 cli_shutdown(cli);
                 return result;
@@ -127 +98 @@
                     !NT_STATUS_EQUAL(result, NT_STATUS_PASSWORD_EXPIRED)) {
                         if (asprintf(err_str, "Could not connect to machine %s: "
-                                 "%s\n", remote_machine, cli_errstr(cli)) == -1) {
+                                 "%s\n", remote_machine, nt_errstr(result)) == -1) {
                                 *err_str = NULL;
                         }
@@ -147 +118 @@
                         if (asprintf(err_str, "machine %s rejected the session "
                                  "setup. Error was : %s.\n",        
-                                 remote_machine, cli_errstr(cli)) == -1) {
-                                *err_str = NULL;
-                        }
-                        cli_shutdown(cli);
-                        return result;
-                }
-
-                result = cli_init_creds(cli, "", "", NULL);
-                if (!NT_STATUS_IS_OK(result)) {
-                        cli_shutdown(cli);
-                        return result;
-                }
-        } else {
-                result = cli_init_creds(cli, user, domain, old_passwd);
-                if (!NT_STATUS_IS_OK(result)) {
-                        cli_shutdown(cli);
-                        return result;
-                }
-        }
-
-        result = cli_tcon_andx(cli, "IPC$", "IPC", "", 1);
+                                 remote_machine, nt_errstr(result)) == -1) {
+                                *err_str = NULL;
+                        }
+                        cli_shutdown(cli);
+                        return result;
+                }
+        }
+
+        result = cli_tree_connect(cli, "IPC$", "IPC", "", 1);
         if (!NT_STATUS_IS_OK(result)) {
                 if (asprintf(err_str, "machine %s rejected the tconX on the "
@@ -181 +140 @@
 
         if (!pass_must_change) {
-                result = cli_rpc_pipe_open_ntlmssp(cli,
-                                                   &ndr_table_samr.syntax_id,
-                                                   NCACN_NP,
-                                                   DCERPC_AUTH_LEVEL_PRIVACY,
-                                                   domain, user,
-                                                   old_passwd,
-                                                   &pipe_hnd);
+                result = cli_rpc_pipe_open_generic_auth(cli,
+                                                        &ndr_table_samr,
+                                                        NCACN_NP,
+                                                        CRED_DONT_USE_KERBEROS,
+                                                        DCERPC_AUTH_TYPE_NTLMSSP,
+                                                        DCERPC_AUTH_LEVEL_PRIVACY,
+                                                        remote_machine,
+                                                        domain, user,
+                                                        old_passwd,
+                                                        &pipe_hnd);
         } else {
                 /*
@@ -198 +160 @@
                  */
                 result = cli_rpc_pipe_open_noauth(
-                        cli, &ndr_table_samr.syntax_id, &pipe_hnd);
+                        cli, &ndr_table_samr, &pipe_hnd);
         }
 
@@ -205 +167 @@
                         /* Use the old RAP method. */
                         if (!cli_oem_change_password(cli, user_name, new_passwd, old_passwd)) {
+                                result = cli_nt_error(cli);
                                 if (asprintf(err_str, "machine %s rejected the "
                                          "password change: Error was : %s.\n",
-                                         remote_machine, cli_errstr(cli)) == -1) {
+                                         remote_machine, nt_errstr(result)) == -1) {
                                         *err_str = NULL;
                                 }
-                                result = cli_nt_error(cli);
                                 cli_shutdown(cli);
                                 return result;
@@ -221 +183 @@
                                 *err_str = NULL;
                         }
-                        result = cli_nt_error(cli);
                         cli_shutdown(cli);
                         return result;
@@ -251 +212 @@
 
         /* Try anonymous NTLMSSP... */
-        result = cli_init_creds(cli, "", "", NULL);
-        if (!NT_STATUS_IS_OK(result)) {
-                cli_shutdown(cli);
-                return result;
-        }
-
         result = NT_STATUS_UNSUCCESSFUL;
 
         /* OK, this is ugly, but... try an anonymous pipe. */
-        result = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr.syntax_id,
+        result = cli_rpc_pipe_open_noauth(cli, &ndr_table_samr,
                                           &pipe_hnd);
 
@@ -296 +251 @@
                                 return NT_STATUS_OK;
                         }
+
+                        result = cli_nt_error(cli);
                         if (asprintf(err_str, "machine %s rejected the password "
                                  "change: Error was : %s.\n",
-                                 remote_machine, cli_errstr(cli)) == -1) {
-                                *err_str = NULL;
-                        }
-                        result = cli_nt_error(cli);
+                                 remote_machine, nt_errstr(result)) == -1) {
+                                *err_str = NULL;
+                        }
                         cli_shutdown(cli);
                         return result;
@@ -308 +264 @@
                                  "failed. Error was %s, but LANMAN password "
                                  "changes are disabled\n",
-                                nt_errstr(result), remote_machine) == -1) {
+                                remote_machine, nt_errstr(result)) == -1) {
                                 *err_str = NULL;
                         }