s3: Convert cli_raw_tcon to cli_smb

Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sun Mar 27 19:50:21 CEST 2011 on sn-devel-104

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 6334f6b5873f0fe67eb24d5e5c08b5e10b515058..2fa9e8a2c5018ff192d00105d5af699c2d832bfd 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2708,7 +2708,10 @@ NTSTATUS cli_raw_tcon(struct cli_state *cli,
                      const char *service, const char *pass, const char *dev,
                      uint16 *max_xmit, uint16 *tid)
 {
-       char *p;
+       struct tevent_req *req;
+       uint16_t *ret_vwv;
+       uint8_t *bytes;
+       NTSTATUS status;
 
        if (!lp_client_plaintext_auth() && (*pass)) {
                DEBUG(1, ("Server requested plaintext password but 'client "
@@ -2716,31 +2719,26 @@ NTSTATUS cli_raw_tcon(struct cli_state *cli,
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       memset(cli->outbuf,'\0',smb_size);
-       memset(cli->inbuf,'\0',smb_size);
-
-       cli_set_message(cli->outbuf, 0, 0, True);
-       SCVAL(cli->outbuf,smb_com,SMBtcon);
-       cli_setup_packet(cli);
-
-       p = smb_buf(cli->outbuf);
-       *p++ = 4; p += clistr_push(cli, p, service, -1, STR_TERMINATE | STR_NOALIGN);
-       *p++ = 4; p += clistr_push(cli, p, pass, -1, STR_TERMINATE | STR_NOALIGN);
-       *p++ = 4; p += clistr_push(cli, p, dev, -1, STR_TERMINATE | STR_NOALIGN);
-
-       cli_setup_bcc(cli, p);
-
-       cli_send_smb(cli);
-       if (!cli_receive_smb(cli)) {
-               return NT_STATUS_UNEXPECTED_NETWORK_ERROR;
-       }
-
-       if (cli_is_error(cli)) {
-               return cli_nt_error(cli);
+       bytes = talloc_array(talloc_tos(), uint8_t, 0);
+       bytes = smb_bytes_push_bytes(bytes, 4, NULL, 0);
+       bytes = smb_bytes_push_str(bytes, cli_ucs2(cli),
+                                  service, strlen(service)+1, NULL);
+       bytes = smb_bytes_push_bytes(bytes, 4, NULL, 0);
+       bytes = smb_bytes_push_str(bytes, cli_ucs2(cli),
+                                  pass, strlen(pass)+1, NULL);
+       bytes = smb_bytes_push_bytes(bytes, 4, NULL, 0);
+       bytes = smb_bytes_push_str(bytes, cli_ucs2(cli),
+                                  dev, strlen(dev)+1, NULL);
+
+       status = cli_smb(talloc_tos(), cli, SMBtcon, 0, 0, NULL,
+                        talloc_get_size(bytes), bytes, &req,
+                        2, NULL, &ret_vwv, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       *max_xmit = SVAL(cli->inbuf, smb_vwv0);
-       *tid = SVAL(cli->inbuf, smb_vwv1);
+       *max_xmit = SVAL(ret_vwv + 0, 0);
+       *tid = SVAL(ret_vwv + 1, 0);
 
        return NT_STATUS_OK;
 }

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index c6c0f62896ca610423ba9f37823b3167151ac53f..66433ecfad0cff39d9bd598c330413668685ae3f 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -1394,8 +1394,8 @@ static bool run_tcon2_test(int dummy)
        if (!NT_STATUS_IS_OK(status)) {
                printf("tcon2 failed : %s\n", nt_errstr(status));
        } else {
-               printf("tcon OK : max_xmit=%d cnum=%d tid=%d\n", 
-                      (int)max_xmit, (int)cnum, SVAL(cli->inbuf, smb_tid));
+               printf("tcon OK : max_xmit=%d cnum=%d\n",
+                      (int)max_xmit, (int)cnum);
        }
 
        if (!torture_close_connection(cli)) {