From 4968ce25554b0891bf78601c4b41c8b18c89bde1 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 10 Apr 2008 21:41:03 +0200 Subject: Add very basic cli_cm_* based connection handler to libnetapi. Guenther (This used to be commit e9e46cfcbe25366121f680a6d81fe08c128bf00a) --- source3/lib/netapi/cm.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 source3/lib/netapi/cm.c (limited to 'source3/lib/netapi/cm.c') diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c new file mode 100644 index 0000000000..31446efde3 --- /dev/null +++ b/source3/lib/netapi/cm.c @@ -0,0 +1,75 @@ +/* + * Unix SMB/CIFS implementation. + * NetApi Support + * Copyright (C) Guenther Deschner 2008 + * + * 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 . + */ + +#include "includes.h" + +#include "lib/netapi/netapi.h" + +/******************************************************************** +********************************************************************/ + +WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx, + const char *server_name, + struct cli_state **cli) +{ + struct cli_state *cli_ipc = NULL; + + if (!ctx || !cli || !server_name) { + return WERR_INVALID_PARAM; + } + + cli_cm_set_signing_state(Undefined); + cli_cm_set_use_kerberos(); + + if (ctx->password) { + cli_cm_set_password(ctx->password); + } + if (ctx->username) { + cli_cm_set_username(ctx->username); + } + + if (ctx->username && ctx->username[0] && + ctx->password && ctx->password[0]) { + cli_cm_set_fallback_after_kerberos(); + } + + cli_ipc = cli_cm_open(ctx, NULL, + server_name, "IPC$", + false, false); + if (!cli_ipc) { + libnetapi_set_error_string(ctx, + "Failed to connect to IPC$ share on %s", + server_name); + return WERR_CAN_NOT_COMPLETE; + } + + *cli = cli_ipc; + + return WERR_OK; +} + +/******************************************************************** +********************************************************************/ + +WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx) +{ + cli_cm_shutdown(); + + return WERR_OK; +} -- cgit From deb6362f1f1ac12d6e2a245370ca36accc9506b1 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 10 Apr 2008 21:56:12 +0200 Subject: Fix one missing netapi_private header. Guenther (This used to be commit d34c3e8ad2b21051162e2a9d65f773c486c43d8b) --- source3/lib/netapi/cm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib/netapi/cm.c') diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index 31446efde3..a3b842f96e 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -20,6 +20,7 @@ #include "includes.h" #include "lib/netapi/netapi.h" +#include "lib/netapi/netapi_private.h" /******************************************************************** ********************************************************************/ @@ -54,8 +55,7 @@ WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx, false, false); if (!cli_ipc) { libnetapi_set_error_string(ctx, - "Failed to connect to IPC$ share on %s", - server_name); + "Failed to connect to IPC$ share on %s", server_name); return WERR_CAN_NOT_COMPLETE; } -- cgit From 3d5aecd2b940215c2566b2e429c2cc3803ff0ad4 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 10 Apr 2008 22:42:07 +0200 Subject: Add libnetapi_open_pipe, inspired by the cli_cm_ interface. Guenther (This used to be commit 87d8fc338f6e6b48691bff3eeebfc00c5d408ff7) --- source3/lib/netapi/cm.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) (limited to 'source3/lib/netapi/cm.c') diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index a3b842f96e..96087247d2 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -73,3 +73,113 @@ WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx) return WERR_OK; } + +/******************************************************************** +********************************************************************/ + +struct client_pipe_connection { + struct client_pipe_connection *prev, *next; + struct rpc_pipe_client *pipe; +}; + +static struct client_pipe_connection *pipe_connections; + +/******************************************************************** +********************************************************************/ + +static struct rpc_pipe_client *pipe_cm_find(struct cli_state *cli, + int pipe_idx, + NTSTATUS *status) +{ + struct client_pipe_connection *p; + + for (p = pipe_connections; p; p = p->next) { + + if (!p->pipe->cli) { + *status = NT_STATUS_PIPE_EMPTY; + return NULL; + } + + if (strequal(cli->desthost, p->pipe->cli->desthost) && + pipe_idx == p->pipe->pipe_idx) { + *status = NT_STATUS_OK; + return p->pipe; + } + } + + *status = NT_STATUS_PIPE_NOT_AVAILABLE; + + return NULL; +} + +/******************************************************************** +********************************************************************/ + +static struct rpc_pipe_client *pipe_cm_connect(TALLOC_CTX *mem_ctx, + struct cli_state *cli, + int pipe_idx, + NTSTATUS *status) +{ + struct client_pipe_connection *p; + + p = TALLOC_ZERO_ARRAY(mem_ctx, struct client_pipe_connection, 1); + if (!p) { + *status = NT_STATUS_NO_MEMORY; + return NULL; + } + + p->pipe = cli_rpc_pipe_open_noauth(cli, pipe_idx, status); + if (!p->pipe) { + TALLOC_FREE(p); + return NULL; + } + + DLIST_ADD(pipe_connections, p); + + return p->pipe; +} + +/******************************************************************** +********************************************************************/ + +static struct rpc_pipe_client *pipe_cm_open(TALLOC_CTX *ctx, + struct cli_state *cli, + int pipe_idx, + NTSTATUS *status) +{ + struct rpc_pipe_client *p; + + p = pipe_cm_find(cli, pipe_idx, status); + if (!p) { + p = pipe_cm_connect(ctx, cli, pipe_idx, status); + } + + return p; +} + +/******************************************************************** +********************************************************************/ + +WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx, + struct cli_state *cli, + int pipe_idx, + struct rpc_pipe_client **pipe_cli) +{ + NTSTATUS status; + + if (!cli || !pipe_cli) { + return WERR_INVALID_PARAM; + } + + *pipe_cli = pipe_cm_open(ctx, cli, pipe_idx, &status); + if (!*pipe_cli) { + libnetapi_set_error_string(ctx, "failed to open PIPE %s: %s", + cli_get_pipe_name(pipe_idx), + get_friendly_nt_error_msg(status)); + return WERR_DEST_NOT_FOUND; + } + + return WERR_OK; +} + + -- cgit From aea1a244eed1c474d8e95048563c2d304a4f3696 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Sun, 13 Apr 2008 19:22:24 +0200 Subject: libnetapi: add libnetapi_set_use_kerberos Don't unconditionally set the kerberos flag for authentication. Guenther (This used to be commit 15bef5ae413adf278cccc0e547c4b8ccd180eca2) --- source3/lib/netapi/cm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source3/lib/netapi/cm.c') diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index 96087247d2..071ebfd4bc 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -36,7 +36,10 @@ WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx, } cli_cm_set_signing_state(Undefined); - cli_cm_set_use_kerberos(); + + if (ctx->use_kerberos) { + cli_cm_set_use_kerberos(); + } if (ctx->password) { cli_cm_set_password(ctx->password); @@ -46,7 +49,8 @@ WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx, } if (ctx->username && ctx->username[0] && - ctx->password && ctx->password[0]) { + ctx->password && ctx->password[0] && + ctx->use_kerberos) { cli_cm_set_fallback_after_kerberos(); } -- cgit From 2a2188591b5ed922d09dc723adcf10f8b8f5e5a0 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 19 Apr 2008 21:56:43 +0200 Subject: Add "desthost" to rpc_pipe_client This reduces the dependency on cli_state (This used to be commit 783afab9c891dd7bcb78895b2a639b6f3a0edf5b) --- source3/lib/netapi/cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/netapi/cm.c') diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index 071ebfd4bc..5464237247 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -104,7 +104,7 @@ static struct rpc_pipe_client *pipe_cm_find(struct cli_state *cli, return NULL; } - if (strequal(cli->desthost, p->pipe->cli->desthost) && + if (strequal(cli->desthost, p->pipe->desthost) && pipe_idx == p->pipe->pipe_idx) { *status = NT_STATUS_OK; return p->pipe; -- cgit From f56eedb95c64593ceff0ef91b99729c5071aa7ac Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 20 Apr 2008 11:45:41 +0200 Subject: Remove the pipe_idx variable from rpc_pipe_client (This used to be commit 4840febcd481563c3d9b2fabc1fe1b2ae5a76cf6) --- source3/lib/netapi/cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/netapi/cm.c') diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index 5464237247..2e16b98ffb 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -105,7 +105,7 @@ static struct rpc_pipe_client *pipe_cm_find(struct cli_state *cli, } if (strequal(cli->desthost, p->pipe->desthost) && - pipe_idx == p->pipe->pipe_idx) { + rpccli_is_pipe_idx(p->pipe, pipe_idx)) { *status = NT_STATUS_OK; return p->pipe; } -- cgit From b9cc05506273e5ce3398a5912b9c9e5989717480 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 20 Apr 2008 14:05:25 +0200 Subject: Introduce rpc_pipe_np_smb_conn() This abstracts away all references to rpc_pipe_client->cli, the only reference is now in cli_pipe.c. (This used to be commit c56e1c08cef107ff33a34346ceeca3475a102b19) --- source3/lib/netapi/cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/netapi/cm.c') diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index 2e16b98ffb..ae1091c504 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -99,7 +99,7 @@ static struct rpc_pipe_client *pipe_cm_find(struct cli_state *cli, for (p = pipe_connections; p; p = p->next) { - if (!p->pipe->cli) { + if (!rpc_pipe_np_smb_conn(p->pipe)) { *status = NT_STATUS_PIPE_EMPTY; return NULL; } -- cgit From 1335da2a7cc639310e5d389e8e8dbe67c4e7ca25 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 20 Jul 2008 11:04:31 +0200 Subject: Refactoring: Change calling conventions for cli_rpc_pipe_open_noauth Pass in ndr_syntax_id instead of pipe_idx, return NTSTATUS (This used to be commit 9abc9dc4dc13bd3e42f98eff64eacf24b51f5779) --- source3/lib/netapi/cm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/lib/netapi/cm.c') diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index ae1091c504..fe5490c73b 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -132,8 +132,9 @@ static struct rpc_pipe_client *pipe_cm_connect(TALLOC_CTX *mem_ctx, return NULL; } - p->pipe = cli_rpc_pipe_open_noauth(cli, pipe_idx, status); - if (!p->pipe) { + *status = cli_rpc_pipe_open_noauth(cli, cli_get_iface(pipe_idx), + &p->pipe); + if (!NT_STATUS_IS_OK(*status)) { TALLOC_FREE(p); return NULL; } -- cgit From 798b56edaec88206b0d61d2852af41777d53aef2 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 20 Jul 2008 17:59:30 +0200 Subject: Refactoring: libnetapi_open_pipe takes an interface instead of pipe_idx (This used to be commit 726e56c72fdb685ab5eddefd2fd8b043dc38d6ad) --- source3/lib/netapi/cm.c | 76 ++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 39 deletions(-) (limited to 'source3/lib/netapi/cm.c') diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index fe5490c73b..8eaabb3cda 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -91,75 +91,70 @@ static struct client_pipe_connection *pipe_connections; /******************************************************************** ********************************************************************/ -static struct rpc_pipe_client *pipe_cm_find(struct cli_state *cli, - int pipe_idx, - NTSTATUS *status) +static NTSTATUS pipe_cm_find(struct cli_state *cli, + const struct ndr_syntax_id *interface, + struct rpc_pipe_client **presult) { struct client_pipe_connection *p; for (p = pipe_connections; p; p = p->next) { if (!rpc_pipe_np_smb_conn(p->pipe)) { - *status = NT_STATUS_PIPE_EMPTY; - return NULL; + return NT_STATUS_PIPE_EMPTY; } - if (strequal(cli->desthost, p->pipe->desthost) && - rpccli_is_pipe_idx(p->pipe, pipe_idx)) { - *status = NT_STATUS_OK; - return p->pipe; + if (strequal(cli->desthost, p->pipe->desthost) + && ndr_syntax_id_equal(&p->pipe->abstract_syntax, + interface)) { + *presult = p->pipe; + return NT_STATUS_OK; } } - *status = NT_STATUS_PIPE_NOT_AVAILABLE; - - return NULL; + return NT_STATUS_PIPE_NOT_AVAILABLE; } /******************************************************************** ********************************************************************/ -static struct rpc_pipe_client *pipe_cm_connect(TALLOC_CTX *mem_ctx, - struct cli_state *cli, - int pipe_idx, - NTSTATUS *status) +static NTSTATUS pipe_cm_connect(TALLOC_CTX *mem_ctx, + struct cli_state *cli, + const struct ndr_syntax_id *interface, + struct rpc_pipe_client **presult) { struct client_pipe_connection *p; + NTSTATUS status; p = TALLOC_ZERO_ARRAY(mem_ctx, struct client_pipe_connection, 1); if (!p) { - *status = NT_STATUS_NO_MEMORY; - return NULL; + return NT_STATUS_NO_MEMORY; } - *status = cli_rpc_pipe_open_noauth(cli, cli_get_iface(pipe_idx), - &p->pipe); - if (!NT_STATUS_IS_OK(*status)) { + status = cli_rpc_pipe_open_noauth(cli, interface, &p->pipe); + if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(p); - return NULL; + return status; } DLIST_ADD(pipe_connections, p); - return p->pipe; + *presult = p->pipe; + return NT_STATUS_OK; } /******************************************************************** ********************************************************************/ -static struct rpc_pipe_client *pipe_cm_open(TALLOC_CTX *ctx, - struct cli_state *cli, - int pipe_idx, - NTSTATUS *status) +static NTSTATUS pipe_cm_open(TALLOC_CTX *ctx, + struct cli_state *cli, + const struct ndr_syntax_id *interface, + struct rpc_pipe_client **presult) { - struct rpc_pipe_client *p; - - p = pipe_cm_find(cli, pipe_idx, status); - if (!p) { - p = pipe_cm_connect(ctx, cli, pipe_idx, status); + if (NT_STATUS_IS_OK(pipe_cm_find(cli, interface, presult))) { + return NT_STATUS_OK; } - return p; + return pipe_cm_connect(ctx, cli, interface, presult); } /******************************************************************** @@ -167,23 +162,26 @@ static struct rpc_pipe_client *pipe_cm_open(TALLOC_CTX *ctx, WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx, struct cli_state *cli, - int pipe_idx, - struct rpc_pipe_client **pipe_cli) + const struct ndr_syntax_id *interface, + struct rpc_pipe_client **presult) { + struct rpc_pipe_client *result; NTSTATUS status; - if (!cli || !pipe_cli) { + if (!cli || !presult) { return WERR_INVALID_PARAM; } - *pipe_cli = pipe_cm_open(ctx, cli, pipe_idx, &status); - if (!*pipe_cli) { + status = pipe_cm_open(ctx, cli, interface, &result); + if (!NT_STATUS_IS_OK(status)) { libnetapi_set_error_string(ctx, "failed to open PIPE %s: %s", - cli_get_pipe_name(pipe_idx), + cli_get_pipe_name_from_iface(debug_ctx(), cli, + interface), get_friendly_nt_error_msg(status)); return WERR_DEST_NOT_FOUND; } + *presult = result; return WERR_OK; } -- cgit From d701d23b604dd21288e894b7d286de206eca2857 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 30 Jul 2008 16:06:30 -0700 Subject: Fix uninitialized variables. Jeremy. (This used to be commit 1db7e00a5400863fd5dbb81c1a4c6ea6092d0495) --- source3/lib/netapi/cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/netapi/cm.c') diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index 8eaabb3cda..8ea31e54f9 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -165,7 +165,7 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx, const struct ndr_syntax_id *interface, struct rpc_pipe_client **presult) { - struct rpc_pipe_client *result; + struct rpc_pipe_client *result = NULL; NTSTATUS status; if (!cli || !presult) { -- cgit From fcd10d26a407bef323cb8beda39a21aeb1e5b144 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 12 Aug 2008 17:59:23 +0200 Subject: netapi: make libnetapi_open_ipc_connection static. Guenther (cherry picked from commit 0259914f8ff04514a8395d8e1af61aadd50c5efb) (This used to be commit 7edc671cc1007ae216e7efdbcdb9cfa1e547dca5) --- source3/lib/netapi/cm.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'source3/lib/netapi/cm.c') diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c index 8ea31e54f9..a5c85bfe6b 100644 --- a/source3/lib/netapi/cm.c +++ b/source3/lib/netapi/cm.c @@ -25,9 +25,9 @@ /******************************************************************** ********************************************************************/ -WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx, - const char *server_name, - struct cli_state **cli) +static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx, + const char *server_name, + struct cli_state **cli) { struct cli_state *cli_ipc = NULL; @@ -161,17 +161,25 @@ static NTSTATUS pipe_cm_open(TALLOC_CTX *ctx, ********************************************************************/ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx, - struct cli_state *cli, + const char *server_name, const struct ndr_syntax_id *interface, + struct cli_state **pcli, struct rpc_pipe_client **presult) { struct rpc_pipe_client *result = NULL; NTSTATUS status; + WERROR werr; + struct cli_state *cli = NULL; - if (!cli || !presult) { + if (!presult) { return WERR_INVALID_PARAM; } + werr = libnetapi_open_ipc_connection(ctx, server_name, &cli); + if (!W_ERROR_IS_OK(werr)) { + return werr; + } + status = pipe_cm_open(ctx, cli, interface, &result); if (!NT_STATUS_IS_OK(status)) { libnetapi_set_error_string(ctx, "failed to open PIPE %s: %s", @@ -182,6 +190,8 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx, } *presult = result; + *pcli = cli; + return WERR_OK; } -- cgit