summaryrefslogtreecommitdiff
path: root/source4/lib/registry
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib/registry')
-rw-r--r--source4/lib/registry/config.mk2
-rw-r--r--source4/lib/registry/tools/regshell.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 6528127b0b..a566042cf2 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -105,6 +105,6 @@ $(eval $(call proto_header_template,$(libregistrysrcdir)/tests/proto.h,$(torture
[PYTHON::py_registry]
LIBRARY_REALNAME = samba/registry.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = registry PYTALLOC swig_credentials param
+PUBLIC_DEPENDENCIES = registry PYTALLOC pycredentials param
py_registry_OBJ_FILES = $(libregistrysrcdir)/pyregistry.o
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 8939f21269..0fc06d1219 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -159,12 +159,12 @@ static WERROR cmd_set(struct regshell_context *ctx, int argc, char **argv)
static WERROR cmd_ck(struct regshell_context *ctx, int argc, char **argv)
{
- struct registry_key *new = NULL;
+ struct registry_key *nkey = NULL;
WERROR error;
if(argc == 2) {
error = reg_open_key(ctx->registry, ctx->current, argv[1],
- &new);
+ &nkey);
if(!W_ERROR_IS_OK(error)) {
DEBUG(0, ("Error opening specified key: %s\n",
win_errstr(error)));
@@ -172,7 +172,7 @@ static WERROR cmd_ck(struct regshell_context *ctx, int argc, char **argv)
}
ctx->path = talloc_asprintf(ctx, "%s\\%s", ctx->path, argv[1]);
- ctx->current = new;
+ ctx->current = nkey;
}
printf("New path is: %s\n", ctx->path);