[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Sep 21 17:13:53 MDT 2010
The branch, master has been updated
via 6172681 s3-libgpo: fix the build of scripts client side extension.
via 2cf1f05 s3: Remove a global variable in bugfix for bug 7665
from 93c9582 s4: Add script for landing a branch through a remote server, such as sn.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 617268101a36fa01ab8c3865435d5316a915784a
Author: Günther Deschner <gd at samba.org>
Date: Tue Sep 21 16:13:33 2010 -0700
s3-libgpo: fix the build of scripts client side extension.
Guenther
commit 2cf1f0586038d5460d42a9cd4c3bc5c8a936d6ad
Author: Volker Lendecke <vl at samba.org>
Date: Tue Sep 21 15:41:23 2010 -0700
s3: Remove a global variable in bugfix for bug 7665
Signed-off-by: Günther Deschner <gd at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/netapi/cm.c | 17 ++++++++++-------
source3/lib/netapi/netapi_private.h | 1 +
source3/libgpo/gpext/scripts.c | 1 +
3 files changed, 12 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index bff2742..b94da64 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -37,16 +37,15 @@ struct client_pipe_connection {
struct rpc_pipe_client *pipe;
};
-static struct client_ipc_connection *ipc_connections = NULL;
-
/********************************************************************
********************************************************************/
-static struct client_ipc_connection *ipc_cm_find(const char *server_name)
+static struct client_ipc_connection *ipc_cm_find(
+ struct libnetapi_private_ctx *priv_ctx, const char *server_name)
{
struct client_ipc_connection *p;
- for (p = ipc_connections; p; p = p->next) {
+ for (p = priv_ctx->ipc_connections; p; p = p->next) {
if (strequal(p->cli->desthost, server_name)) {
return p;
}
@@ -62,6 +61,8 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
const char *server_name,
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;
struct client_ipc_connection *p;
@@ -70,7 +71,7 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
return WERR_INVALID_PARAM;
}
- p = ipc_cm_find(server_name);
+ p = ipc_cm_find(priv_ctx, server_name);
if (p) {
*pp = p;
return WERR_OK;
@@ -124,7 +125,7 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
}
p->cli = cli_ipc;
- DLIST_ADD(ipc_connections, p);
+ DLIST_ADD(priv_ctx->ipc_connections, p);
*pp = p;
@@ -136,9 +137,11 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
WERROR libnetapi_shutdown_cm(struct libnetapi_ctx *ctx)
{
+ struct libnetapi_private_ctx *priv_ctx =
+ (struct libnetapi_private_ctx *)ctx->private_data;
struct client_ipc_connection *p;
- for (p = ipc_connections; p; p = p->next) {
+ for (p = priv_ctx->ipc_connections; p; p = p->next) {
cli_shutdown(p->cli);
}
diff --git a/source3/lib/netapi/netapi_private.h b/source3/lib/netapi/netapi_private.h
index effe2eb..d0f7756 100644
--- a/source3/lib/netapi/netapi_private.h
+++ b/source3/lib/netapi/netapi_private.h
@@ -43,6 +43,7 @@ struct libnetapi_private_ctx {
struct policy_handle builtin_handle;
} samr;
+ struct client_ipc_connection *ipc_connections;
};
NET_API_STATUS libnetapi_get_password(struct libnetapi_ctx *ctx, char **password);
diff --git a/source3/libgpo/gpext/scripts.c b/source3/libgpo/gpext/scripts.c
index bc62b81..693924d 100644
--- a/source3/libgpo/gpext/scripts.c
+++ b/source3/libgpo/gpext/scripts.c
@@ -22,6 +22,7 @@
#include "../libgpo/gpo.h"
#include "libgpo/gpo_proto.h"
#include "registry.h"
+#include "registry/reg_api.h"
#define GP_EXT_NAME "scripts"
--
Samba Shared Repository
More information about the samba-cvs
mailing list