Changeset 590 for trunk/server/source3/lib/netapi/cm.c

Timestamp:

Jul 1, 2011, 8:40:10 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.6

File:

• trunk/server/source3/lib/netapi/cm.c (modified) (12 diffs)

trunk/server/source3/lib/netapi/cm.c

@@ -26 +26 @@
 ********************************************************************/
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
                                             const char *server_name,
-                                            struct cli_state **cli)
-{
+                                            struct client_ipc_connection **pp)
+{
+        struct libnetapi_private_ctx *priv_ctx =
+                (struct libnetapi_private_ctx *)ctx->private_data;
         struct user_auth_info *auth_info = NULL;
         struct cli_state *cli_ipc = NULL;
-
-        if (!ctx || !cli || !server_name) {
+        struct client_ipc_connection *p;
+
+        if (!ctx || !pp || !server_name) {
                 return WERR_INVALID_PARAM;
         }
 
-        auth_info = user_auth_info_init(NULL);
+        p = ipc_cm_find(priv_ctx, server_name);
+        if (p) {
+                *pp = p;
+                return WERR_OK;
+        }
+
+        auth_info = user_auth_info_init(ctx);
         if (!auth_info) {
                 return WERR_NOMEM;
@@ -79 +119 @@
         }
 
-        *cli = cli_ipc;
+        p = TALLOC_ZERO_P(ctx, struct client_ipc_connection);
+        if (p == NULL) {
+                return WERR_NOMEM;
+        }
+
+        p->cli = cli_ipc;
+        DLIST_ADD(priv_ctx->ipc_connections, p);
+
+        *pp = p;
 
         return WERR_OK;
@@ -87 +135 @@
 ********************************************************************/
 
-struct client_pipe_connection {
-        struct client_pipe_connection *prev, *next;
-        struct rpc_pipe_client *pipe;
-        struct cli_state *cli;
-};
-
-static struct client_pipe_connection *pipe_connections;
-
-/********************************************************************
-********************************************************************/
-
 WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx)
 {
-        struct client_pipe_connection *p;
-
-        for (p = pipe_connections; p; p = p->next) {
+        struct libnetapi_private_ctx *priv_ctx =
+                (struct libnetapi_private_ctx *)ctx->private_data;
+        struct client_ipc_connection *p;
+
+        for (p = priv_ctx->ipc_connections; p; p = p->next) {
                 cli_shutdown(p->cli);
         }
@@ -112 +151 @@
 ********************************************************************/
 
-static NTSTATUS pipe_cm_find(struct cli_state *cli,
+static NTSTATUS pipe_cm_find(struct cli,
                              const struct ndr_syntax_id *interface,
                              struct rpc_pipe_client **presult)
@@ -118 +157 @@
         struct client_pipe_connection *p;
 
-        for (p = pipe_connections; p; p = p->next) {
+        for (p = pipe_connections; p; p = p->next) {
 
                 if (!rpc_pipe_np_smb_conn(p->pipe)) {
@@ -124 +163 @@
                 }
 
-                if (strequal(cli->desthost, p->pipe->desthost)
+                if (strequal(cli->desthost, p->pipe->desthost)
                     && ndr_syntax_id_equal(&p->pipe->abstract_syntax,
                                            interface)) {
@@ -139 +178 @@
 
 static NTSTATUS pipe_cm_connect(TALLOC_CTX *mem_ctx,
-                                struct cli_state *cli,
+                                struct cli,
                                 const struct ndr_syntax_id *interface,
                                 struct rpc_pipe_client **presult)
@@ -151 +190 @@
         }
 
-        status = cli_rpc_pipe_open_noauth(cli, interface, &p->pipe);
+        status = cli_rpc_pipe_open_noauth(cli, interface, &p->pipe);
         if (!NT_STATUS_IS_OK(status)) {
                 TALLOC_FREE(p);
@@ -157 +196 @@
         }
 
-        p->cli = cli;
-        DLIST_ADD(pipe_connections, p);
+        DLIST_ADD(ipc->pipe_connections, p);
 
         *presult = p->pipe;
@@ -168 +206 @@
 
 static NTSTATUS pipe_cm_open(TALLOC_CTX *ctx,
-                             struct cli_state *cli,
+                             struct cli,
                              const struct ndr_syntax_id *interface,
                              struct rpc_pipe_client **presult)
 {
-        if (NT_STATUS_IS_OK(pipe_cm_find(cli, interface, presult))) {
+        if (NT_STATUS_IS_OK(pipe_cm_find(, interface, presult))) {
                 return NT_STATUS_OK;
         }
 
-        return pipe_cm_connect(ctx, cli, interface, presult);
+        return pipe_cm_connect(ctx, , interface, presult);
 }
 
@@ -190 +228 @@
         NTSTATUS status;
         WERROR werr;
-        struct cli_state *cli = NULL;
+        struct cli = NULL;
 
         if (!presult) {
@@ -196 +234 @@
         }
 
-        werr = libnetapi_open_ipc_connection(ctx, server_name, &cli);
+        werr = libnetapi_open_ipc_connection(ctx, server_name, &);
         if (!W_ERROR_IS_OK(werr)) {
                 return werr;
         }
 
-        status = pipe_cm_open(ctx, cli, interface, &result);
+        status = pipe_cm_open(ctx, , interface, &result);
         if (!NT_STATUS_IS_OK(status)) {
                 libnetapi_set_error_string(ctx, "failed to open PIPE %s: %s",