[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-805-g5804d8b

Günther Deschner gd at samba.org
Thu Apr 10 20:46:35 GMT 2008


The branch, v3-2-test has been updated
       via  5804d8b112e1da022988c635284eb4799974d4c7 (commit)
       via  87d8fc338f6e6b48691bff3eeebfc00c5d408ff7 (commit)
      from  d9f19fc61586d606393368799dee9757c169d602 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 5804d8b112e1da022988c635284eb4799974d4c7
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 10 22:44:00 2008 +0200

    Use libnetapi_open_pipe in netapi functions.
    
    Guenther

commit 87d8fc338f6e6b48691bff3eeebfc00c5d408ff7
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 10 22:42:07 2008 +0200

    Add libnetapi_open_pipe, inspired by the cli_cm_ interface.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/lib/netapi/cm.c             |  110 ++++++++++++++++++++++++++++++++++++
 source/lib/netapi/getdc.c          |   20 ++----
 source/lib/netapi/joindomain.c     |   24 +++-----
 source/lib/netapi/netapi_private.h |    4 +
 source/lib/netapi/serverinfo.c     |   16 ++---
 source/lib/netapi/user.c           |   15 ++---
 6 files changed, 141 insertions(+), 48 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/cm.c b/source/lib/netapi/cm.c
index a3b842f..9608724 100644
--- a/source/lib/netapi/cm.c
+++ b/source/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;
+}
+
+
diff --git a/source/lib/netapi/getdc.c b/source/lib/netapi/getdc.c
index 8f88294..38aaf0e 100644
--- a/source/lib/netapi/getdc.c
+++ b/source/lib/netapi/getdc.c
@@ -50,10 +50,8 @@ WERROR NetGetDCName_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_NETLOGON,
-					    &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_NETLOGON, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -92,12 +90,10 @@ WERROR NetGetAnyDCName_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_NETLOGON,
-					    &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_NETLOGON, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
-	};
+	}
 
 	status = rpccli_netr_GetAnyDCName(pipe_cli, ctx,
 					  r->in.server_name,
@@ -152,10 +148,8 @@ WERROR DsGetDcName_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_NETLOGON,
-					    &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_NETLOGON, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
diff --git a/source/lib/netapi/joindomain.c b/source/lib/netapi/joindomain.c
index 056d8d2..8e0a62e 100644
--- a/source/lib/netapi/joindomain.c
+++ b/source/lib/netapi/joindomain.c
@@ -108,10 +108,8 @@ WERROR NetJoinDomain_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_WKSSVC,
-					    &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_WKSSVC, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -239,10 +237,8 @@ WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_WKSSVC,
-					    &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_WKSSVC, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -292,10 +288,8 @@ WERROR NetGetJoinInformation_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_WKSSVC,
-					    &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_WKSSVC, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -422,10 +416,8 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_WKSSVC,
-					    &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_WKSSVC, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
diff --git a/source/lib/netapi/netapi_private.h b/source/lib/netapi/netapi_private.h
index 2591a7b..a575f42 100644
--- a/source/lib/netapi/netapi_private.h
+++ b/source/lib/netapi/netapi_private.h
@@ -29,4 +29,8 @@ WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
 				     const char *server_name,
 				     struct cli_state **cli);
 WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx);
+WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
+			   struct cli_state *cli,
+			   int pipe_idx,
+			   struct rpc_pipe_client **pipe_cli);
 #endif
diff --git a/source/lib/netapi/serverinfo.c b/source/lib/netapi/serverinfo.c
index 238b9ca..58efeb3 100644
--- a/source/lib/netapi/serverinfo.c
+++ b/source/lib/netapi/serverinfo.c
@@ -75,12 +75,10 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC,
-					    &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_SRVSVC, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
-	};
+	}
 
 	status = rpccli_srvsvc_NetSrvGetInfo(pipe_cli, ctx,
 					     r->in.server_name,
@@ -177,12 +175,10 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC,
-					    &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_SRVSVC, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
-	};
+	}
 
 	switch (r->in.level) {
 		case 1005:
diff --git a/source/lib/netapi/user.c b/source/lib/netapi/user.c
index d9505bc..31e5faa 100644
--- a/source/lib/netapi/user.c
+++ b/source/lib/netapi/user.c
@@ -185,9 +185,8 @@ WERROR NetUserAdd_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SAMR, &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_SAMR, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -378,9 +377,8 @@ WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SAMR, &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_SAMR, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -602,9 +600,8 @@ WERROR NetUserEnum_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SAMR, &status);
-	if (!pipe_cli) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_open_pipe(ctx, cli, PI_SAMR, &pipe_cli);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list