sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

r5680: Don't crash if none of the predefined keys is available (reported by Alexander)

Browse Source 
(This used to be commit 0d789872a890062b0b95aa039bb853bb6c07b2d0)
This commit is contained in:
Jelmer Vernooij 2005-03-07 12:02:48 +00:00 committed by Gerald (Jerry) Carter
parent 983306c819
commit 3e88cae57b
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source4/lib/registry/tools/regshell.c
View File

@ -408,8 +408,34 @@ static char **reg_completion(const char *text, int start, int end)
}
if (h) {
/*FIXME: What if HKEY_CLASSES_ROOT is not present ? */
reg_get_predefined_key(h, HKEY_CLASSES_ROOT, &curkey);
enum reg_predefined_key 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++) {
WERROR err;
err = reg_get_predefined_key(h, HKEY_CLASSES_ROOT, &curkey);
if (W_ERROR_IS_OK(err)) {
break;
} else {
curkey = NULL;
}
}
}
if (!curkey) {
fprintf(stderr, "Unable to access any of the predefined keys\n");
return -1;
}
poptFreeContext(pc);