summaryrefslogtreecommitdiff
path: root/source4/lib/registry/tools/regshell.c
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib/registry/tools/regshell.c')
-rw-r--r--source4/lib/registry/tools/regshell.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 4e859df3f6..98f7f02c38 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/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)