Attachment 3494 Details for Bug 5704 – Patch to fix WERR_NOMEM

[patch] Patch to fix WERR_NOMEM

regRpc.patch (text/plain), 4.05 KB, created by Matthias Dieter Wallnöfer on 2008-08-19 13:56:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Dieter Wallnöfer

Created: 2008-08-19 13:56:42 UTC

Size: 4.05 KB

patch

obsolete

>diff --git a/source/lib/registry/tools/common.c b/source/lib/registry/tools/common.c
>index 3ea780d..f770f6a 100644
>--- a/source/lib/registry/tools/common.c
>+++ b/source/lib/registry/tools/common.c
>@@ -24,13 +24,14 @@
> #include "lib/registry/tools/common.h"
> 
> struct registry_context *reg_common_open_remote(const char *remote,
>+						struct event_context *ev_ctx,
> 						struct loadparm_context *lp_ctx,
> 						struct cli_credentials *creds)
> {
> 	struct registry_context *h = NULL;
> 	WERROR error;
> 
>-	error = reg_open_remote(&h, NULL, creds, lp_ctx, remote, NULL);
>+	error = reg_open_remote(&h, NULL, creds, lp_ctx, remote, ev_ctx);
> 
> 	if (!W_ERROR_IS_OK(error)) {
> 		fprintf(stderr, "Unable to open remote registry at %s:%s \n",
>diff --git a/source/lib/registry/tools/regpatch.c b/source/lib/registry/tools/regpatch.c
>index 1170fba..add59a5 100644
>--- a/source/lib/registry/tools/regpatch.c
>+++ b/source/lib/registry/tools/regpatch.c
>@@ -34,7 +34,7 @@ int main(int argc, char **argv)
> 	struct registry_context *h;
> 	const char *file = NULL;
> 	const char *remote = NULL;
>-	struct event_context *ev;
>+	struct event_context *ev_ctx;
> 	struct poptOption long_options[] = {
> 		POPT_AUTOHELP
> 		{"remote", 'R', POPT_ARG_STRING, &remote, 0, "connect to specified remote server", NULL},
>@@ -49,12 +49,12 @@ int main(int argc, char **argv)
> 	while((opt = poptGetNextOpt(pc)) != -1) {
> 	}
> 
>-	ev = s4_event_context_init(NULL);
>+	ev_ctx = s4_event_context_init(NULL);
> 
> 	if (remote) {
>-		h = reg_common_open_remote (remote, cmdline_lp_ctx, cmdline_credentials);
>+		h = reg_common_open_remote (remote, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
> 	} else {
>-		h = reg_common_open_local (cmdline_credentials, ev, cmdline_lp_ctx);
>+		h = reg_common_open_local (cmdline_credentials, ev_ctx, cmdline_lp_ctx);
> 	}
> 
> 	if (h == NULL)
>diff --git a/source/lib/registry/tools/regshell.c b/source/lib/registry/tools/regshell.c
>index 4e859df..98f7f02 100644
>--- a/source/lib/registry/tools/regshell.c
>+++ b/source/lib/registry/tools/regshell.c
>@@ -162,9 +162,7 @@ static WERROR cmd_ck(struct regshell_context *ctx, int argc, char **argv)
> 	struct registry_key *new = NULL;
> 	WERROR error;
> 
>-	if(argc < 2) {
>-		new = ctx->current;
>-	} else {
>+	if(argc == 2) {
> 		error = reg_open_key(ctx->registry, ctx->current, argv[1],
> 				     &new);
> 		if(!W_ERROR_IS_OK(error)) {
>@@ -172,11 +170,11 @@ static WERROR cmd_ck(struct regshell_context *ctx, int argc, char **argv)
> 				win_errstr(error)));
> 			return error;
> 		}
>-	}
> 
>-	ctx->path = talloc_asprintf(ctx, "%s\\%s", ctx->path, argv[1]);
>-	printf("Current path is: %s\n", ctx->path);
>-	ctx->current = new;
>+		ctx->path = talloc_asprintf(ctx, "%s\\%s", ctx->path, argv[1]);
>+		ctx->current = new;
>+	}
>+	printf("New path is: %s\n", ctx->path);
> 
> 	return WERR_OK;
> }
>@@ -188,7 +186,7 @@ static WERROR cmd_print(struct regshell_context *ctx, int argc, char **argv)
> 	WERROR error;
> 
> 	if (argc != 2) {
>-		fprintf(stderr, "Usage: print <valuename>");
>+		fprintf(stderr, "Usage: print <valuename>\n");
> 		return WERR_INVALID_PARAM;
> 	}
> 
>@@ -520,8 +518,8 @@ int main(int argc, char **argv)
> 	ev_ctx = s4_event_context_init(ctx);
> 
> 	if (remote != NULL) {
>-		ctx->registry = reg_common_open_remote(remote, cmdline_lp_ctx, 
>-						       cmdline_credentials);
>+		ctx->registry = reg_common_open_remote(remote, ev_ctx,
>+					 cmdline_lp_ctx, cmdline_credentials);
> 	} else if (file != NULL) {
> 		ctx->current = reg_common_open_file(file, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
> 		if (ctx->current == NULL)
>diff --git a/source/lib/registry/tools/regtree.c b/source/lib/registry/tools/regtree.c
>index daca695..19e4a01 100644
>--- a/source/lib/registry/tools/regtree.c
>+++ b/source/lib/registry/tools/regtree.c
>@@ -132,7 +132,7 @@ int main(int argc, char **argv)
> 	ev_ctx = s4_event_context_init(NULL);
> 
> 	if (remote != NULL) {
>-		h = reg_common_open_remote(remote, cmdline_lp_ctx, cmdline_credentials);
>+		h = reg_common_open_remote(remote, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
> 	} else if (file != NULL) {
> 		start_key = reg_common_open_file(file, ev_ctx, cmdline_lp_ctx, cmdline_credentials);
> 	} else {

Actions: View

Attachments on bug 5704: 3494