summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-30 19:22:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:26 -0500
commitad53de9d599d9ca1b935754d93b455a89198fa37 (patch)
tree5725e16f3d03bcd62a96a159158a644c2f98f3ba
parente0e8743baf6c34987d56c8b7166a7c928bbdd6a5 (diff)
downloadsamba-ad53de9d599d9ca1b935754d93b455a89198fa37.tar.gz
samba-ad53de9d599d9ca1b935754d93b455a89198fa37.tar.bz2
samba-ad53de9d599d9ca1b935754d93b455a89198fa37.zip
r15364: Use global list of predefined keys
(This used to be commit eee9e33442f846d278f0fc545480cc2ec8ea295b)
-rw-r--r--source4/lib/registry/tools/regshell.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index b71c15cb67..6bcaf42b6c 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -439,23 +439,11 @@ static char **reg_completion(const char *text, int start, int end)
}
if (h) {
- uint32_t try_hkeys[] = {
- HKEY_CLASSES_ROOT,
- HKEY_CURRENT_USER,
- HKEY_LOCAL_MACHINE,
- HKEY_USERS,
- HKEY_PERFORMANCE_DATA,
- HKEY_CURRENT_CONFIG,
- HKEY_DYN_DATA,
- HKEY_PERFORMANCE_TEXT,
- HKEY_PERFORMANCE_NLSTEXT,
- 0
- };
int i;
- for (i = 0; try_hkeys[i]; i++) {
+ for (i = 0; reg_predefined_keys[i].handle; i++) {
WERROR err;
- err = reg_get_predefined_key(h, try_hkeys[i], &curkey);
+ err = reg_get_predefined_key(h, reg_predefined_keys[i].handle, &curkey);
if (W_ERROR_IS_OK(err)) {
break;
} else {