summaryrefslogtreecommitdiff
path: root/source3/rpcclient/cmd_reg.c
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1999-10-29 23:15:10 +0000
committerLuke Leighton <lkcl@samba.org>1999-10-29 23:15:10 +0000
commit090d51c8c5d4018d070c7c5575090f0f31fd5e0a (patch)
tree1967807202ea24db7c34f1d2eb63479158a3b62f /source3/rpcclient/cmd_reg.c
parent8ba1c74002d04b2b2d0982ac78ae68e050bd5fa0 (diff)
downloadsamba-090d51c8c5d4018d070c7c5575090f0f31fd5e0a.tar.gz
samba-090d51c8c5d4018d070c7c5575090f0f31fd5e0a.tar.bz2
samba-090d51c8c5d4018d070c7c5575090f0f31fd5e0a.zip
messing with command-line completion. it sort-of works to be able
to enumerate down a key tree, but it's a serious fudge. oops. (This used to be commit a5e805806aab627e69fcdb9fee7170b00710108b)
Diffstat (limited to 'source3/rpcclient/cmd_reg.c')
-rw-r--r--source3/rpcclient/cmd_reg.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/source3/rpcclient/cmd_reg.c b/source3/rpcclient/cmd_reg.c
index 6aec51aa14..4b0c0d8398 100644
--- a/source3/rpcclient/cmd_reg.c
+++ b/source3/rpcclient/cmd_reg.c
@@ -182,13 +182,13 @@ BOOL msrpc_reg_enum_key(struct cli_state *cli, const char* full_keyname,
&num_values, &max_valnamelen, &max_valbufsize,
&sec_desc, &mod_time) : False;
- if (res1)
+ if (res1 && reg_fn != NULL)
{
reg_fn(0, full_keyname, 0);
reg_fn(1, full_keyname, num_subkeys);
}
- for (i = 0; i < num_subkeys; i++)
+ for (i = 0; i < num_subkeys && reg_key_fn != NULL; i++)
{
/*
* enumerate key
@@ -221,9 +221,12 @@ BOOL msrpc_reg_enum_key(struct cli_state *cli, const char* full_keyname,
}
- reg_fn(2, full_keyname, num_values);
+ if (reg_fn != NULL)
+ {
+ reg_fn(2, full_keyname, num_values);
+ }
- for (i = 0; i < num_values; i++)
+ for (i = 0; i < num_values && reg_val_fn != NULL; i++)
{
/*
* enumerate key
@@ -253,7 +256,7 @@ BOOL msrpc_reg_enum_key(struct cli_state *cli, const char* full_keyname,
}
}
- if (res1)
+ if (res1 && reg_fn != NULL)
{
reg_fn(3, full_keyname, 0);
}