r7633: this patch started as an attempt to make the dcerpc code use a given

[gd/samba/.git] / source4 / libcli / cliconnect.c

diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 4d9fb5ba1f0fb95fdda53d0fb9620722e5a10834..0009151429837729bd5ff24d178b686b2e27498a 100644 (file)
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 
@@ -40,8 +39,7 @@ BOOL smbcli_socket_connect(struct smbcli_state *cli, const char *server)
                return False;
        }
        
-       cli->transport = smbcli_transport_init(sock);
-       talloc_free(sock);
+       cli->transport = smbcli_transport_init(sock, cli, True);
        if (!cli->transport) {
                return False;
        }
@@ -65,57 +63,35 @@ NTSTATUS smbcli_negprot(struct smbcli_state *cli)
 
 /* wrapper around smb_raw_session_setup() */
 NTSTATUS smbcli_session_setup(struct smbcli_state *cli, 
-                             const char *user, 
-                             const char *password, 
-                             const char *domain)
+                             struct cli_credentials *credentials)
 {
        struct smb_composite_sesssetup setup;
        NTSTATUS status;
-       TALLOC_CTX *mem_ctx;
 
-       cli->session = smbcli_session_init(cli->transport);
+       cli->session = smbcli_session_init(cli->transport, cli, True);
        if (!cli->session) return NT_STATUS_UNSUCCESSFUL;
-       talloc_free(cli->transport);
-
-       mem_ctx = talloc_init("smbcli_session_setup");
-       if (!mem_ctx) return NT_STATUS_NO_MEMORY;
 
        setup.in.sesskey = cli->transport->negotiate.sesskey;
        setup.in.capabilities = cli->transport->negotiate.capabilities;
-       if (!user || !user[0]) {
-               setup.in.password = NULL;
-               setup.in.user = "";
-               setup.in.domain = "";
-               setup.in.capabilities &= ~CAP_EXTENDED_SECURITY;
-       } else {
-               if (cli->transport->negotiate.sec_mode & NEGOTIATE_SECURITY_USER_LEVEL) {
-                       setup.in.password = password;
-               } else {
-                       setup.in.password = NULL;
-               }
-               setup.in.user = user;
-               setup.in.domain = domain;
-       }
+       setup.in.credentials = credentials;
+       setup.in.workgroup = lp_workgroup();
 
        status = smb_composite_sesssetup(cli->session, &setup);
 
        cli->session->vuid = setup.out.vuid;
 
-       talloc_free(mem_ctx);
-
        return status;
 }
 
 /* wrapper around smb_tree_connect() */
-NTSTATUS smbcli_send_tconX(struct smbcli_state *cli, const char *sharename, 
-                          const char *devtype, const char *password)
+NTSTATUS smbcli_tconX(struct smbcli_state *cli, const char *sharename, 
+                     const char *devtype, const char *password)
 {
        union smb_tcon tcon;
        TALLOC_CTX *mem_ctx;
        NTSTATUS status;
 
-       cli->tree = smbcli_tree_init(cli->session);
-       talloc_free(cli->session);
+       cli->tree = smbcli_tree_init(cli->session, cli, True);
        if (!cli->tree) return NT_STATUS_UNSUCCESSFUL;
 
        mem_ctx = talloc_init("tcon");
@@ -155,33 +131,20 @@ NTSTATUS smbcli_send_tconX(struct smbcli_state *cli, const char *sharename,
 */
 NTSTATUS smbcli_full_connection(TALLOC_CTX *parent_ctx,
                                struct smbcli_state **ret_cli, 
-                               const char *myname,
                                const char *host,
                                const char *sharename,
                                const char *devtype,
-                               const char *username,
-                               const char *domain,
-                               const char *password)
+                               struct cli_credentials *credentials,
+                               struct event_context *ev)
 {
        struct smbcli_tree *tree;
        NTSTATUS status;
-       char *p;
-       TALLOC_CTX *mem_ctx;
-
-       mem_ctx = talloc_init("smbcli_full_connection");
 
        *ret_cli = NULL;
 
-       /* if the username is of the form DOMAIN\username then split out the domain */
-       p = strpbrk(username, "\\/");
-       if (p) {
-               domain = talloc_strndup(mem_ctx, username, PTR_DIFF(p, username));
-               username = talloc_strdup(mem_ctx, p+1);
-       }
-
        status = smbcli_tree_full_connection(parent_ctx,
-                                            &tree, myname, host, 0, sharename, devtype,
-                                            username, domain, password);
+                                            &tree, host, 0, sharename, devtype,
+                                            credentials, ev);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -191,11 +154,8 @@ NTSTATUS smbcli_full_connection(TALLOC_CTX *parent_ctx,
        (*ret_cli)->tree = tree;
        (*ret_cli)->session = tree->session;
        (*ret_cli)->transport = tree->session->transport;
-       talloc_steal(*ret_cli, tree->session->transport->socket);
        
 done:
-       talloc_free(mem_ctx);
-
        return status;
 }
 
@@ -215,7 +175,7 @@ struct smbcli_state *smbcli_state_init(TALLOC_CTX *mem_ctx)
 {
        struct smbcli_state *cli;
 
-       cli = talloc_zero_p(mem_ctx, struct smbcli_state);
+       cli = talloc_zero(mem_ctx, struct smbcli_state);
        if (cli) {
                ZERO_STRUCTP(cli);
        }