sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-03 12:58:35 +03:00
Code

r19912: Move the subkey cache to srv_winreg_nt.c

Browse Source 
(This used to be commit 01a53590a6325413551016effe302585a3a1e656)
This commit is contained in:
Volker Lendecke 2006-11-27 07:41:59 +00:00 committed by Gerald (Jerry) Carter
parent 2685e167fa
commit b189e6d76e
2 changed files with 28 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
source3/registry/reg_frontend.c
View File

@ -184,63 +184,6 @@ int fetch_reg_keys( REGISTRY_KEY *key, REGSUBKEY_CTR *subkey_ctr )
return result; return result;
} }
/***********************************************************************
retreive a specific subkey specified by index. Caller is
responsible for freeing memory
***********************************************************************/
BOOL fetch_reg_keys_specific( REGISTRY_KEY *key, char** subkey, uint32 key_index )
{
static REGSUBKEY_CTR *ctr = NULL;
static pstring save_path;
char *s;
*subkey = NULL;
/* simple caching for performance; very basic heuristic */
DEBUG(8,("fetch_reg_keys_specific: Looking for key [%d] of [%s]\n", key_index, key->name));
if ( !ctr ) {
DEBUG(8,("fetch_reg_keys_specific: Initializing cache of subkeys for [%s]\n", key->name));
if ( !(ctr = TALLOC_ZERO_P( NULL, REGSUBKEY_CTR )) ) {
DEBUG(0,("fetch_reg_keys_specific: talloc() failed!\n"));
return False;
}
pstrcpy( save_path, key->name );
if ( fetch_reg_keys( key, ctr) == -1 )
return False;
}
/* clear the cache when key_index == 0 or the path has changed */
else if ( !key_index || StrCaseCmp( save_path, key->name) ) {
DEBUG(8,("fetch_reg_keys_specific: Updating cache of subkeys for [%s]\n", key->name));
TALLOC_FREE( ctr );
if ( !(ctr = TALLOC_ZERO_P( NULL, REGSUBKEY_CTR )) ) {
DEBUG(0,("fetch_reg_keys_specific: talloc() failed!\n"));
return False;
}
pstrcpy( save_path, key->name );
if ( fetch_reg_keys( key, ctr) == -1 )
return False;
}
if ( !(s = regsubkey_ctr_specific_key( ctr, key_index )) )
return False;
*subkey = SMB_STRDUP( s );
return True;
}
/*********************************************************************** /***********************************************************************
High level wrapper function for enumerating registry values High level wrapper function for enumerating registry values
***********************************************************************/ ***********************************************************************/

41
source3/rpc_server/srv_winreg_nt.c
View File

@ -33,6 +33,7 @@ static struct generic_mapping reg_generic_map =
struct regkey_info { struct regkey_info {
REGISTRY_KEY *key; REGISTRY_KEY *key;
REGVAL_CTR *value_cache; REGVAL_CTR *value_cache;
REGSUBKEY_CTR *subkey_cache;
}; };
/****************************************************************** /******************************************************************
@ -576,35 +577,47 @@ WERROR _winreg_GetVersion(pipes_struct *p, struct policy_handle *handle, uint32_
WERROR _winreg_EnumKey(pipes_struct *p, struct policy_handle *handle, uint32_t enum_index, struct winreg_StringBuf *name, struct winreg_StringBuf *keyclass, NTTIME *last_changed_time) WERROR _winreg_EnumKey(pipes_struct *p, struct policy_handle *handle, uint32_t enum_index, struct winreg_StringBuf *name, struct winreg_StringBuf *keyclass, NTTIME *last_changed_time)
{ {
WERROR status = WERR_OK; WERROR status = WERR_OK;
REGISTRY_KEY *regkey = find_regkey_by_hnd( p, handle ); struct regkey_info *info = find_regkey_info_by_hnd( p, handle );
char *subkey = NULL; REGISTRY_KEY *regkey;
if ( !info )
if ( !regkey )
return WERR_BADFID; return WERR_BADFID;
regkey = info->key;
if ( !name || !keyclass ) if ( !name || !keyclass )
return WERR_INVALID_PARAM; return WERR_INVALID_PARAM;
DEBUG(8,("_reg_enum_key: enumerating key [%s]\n", regkey->name)); DEBUG(8,("_reg_enum_key: enumerating key [%s]\n", regkey->name));
if ( !fetch_reg_keys_specific( regkey, &subkey, enum_index ) ) { if (!info->subkey_cache) {
status = WERR_NO_MORE_ITEMS; if (!(info->subkey_cache = TALLOC_ZERO_P(
goto done; info, REGSUBKEY_CTR))) {
return WERR_NOMEM;
} }
DEBUG(10,("_reg_enum_key: retrieved subkey named [%s]\n", subkey)); if (fetch_reg_keys(regkey, info->subkey_cache) == -1) {
TALLOC_FREE(info->subkey_cache);
return WERR_NO_MORE_ITEMS;
}
}
if (enum_index >= info->subkey_cache->num_subkeys) {
return WERR_NO_MORE_ITEMS;
}
DEBUG(10,("_reg_enum_key: retrieved subkey named [%s]\n",
info->subkey_cache->subkeys[enum_index]));
if (!(name->name = talloc_strdup(
p->mem_ctx, info->subkey_cache->subkeys[enum_index]))) {
status = WERR_NOMEM;
}
if ( last_changed_time ) { if ( last_changed_time ) {
*last_changed_time = 0; *last_changed_time = 0;
} }
keyclass->name = ""; keyclass->name = "";
if ( (name->name = talloc_strdup( p->mem_ctx, subkey )) == NULL ) {
status = WERR_NOMEM;
}
done:
SAFE_FREE( subkey );
return status; return status;
} }
@ -1261,6 +1274,7 @@ WERROR _winreg_CreateKey( pipes_struct *p, struct policy_handle *handle,
write_result = store_reg_keys( newparentinfo->key, subkeys ); write_result = store_reg_keys( newparentinfo->key, subkeys );
TALLOC_FREE( subkeys ); TALLOC_FREE( subkeys );
TALLOC_FREE( newparentinfo->subkey_cache );
if ( !write_result ) if ( !write_result )
return WERR_REG_IO_FAILURE; return WERR_REG_IO_FAILURE;
@ -1419,6 +1433,7 @@ WERROR _winreg_DeleteKey(pipes_struct *p, struct policy_handle *handle, struct w
write_result = store_reg_keys( newparentinfo->key, subkeys ); write_result = store_reg_keys( newparentinfo->key, subkeys );
TALLOC_FREE( subkeys ); TALLOC_FREE( subkeys );
TALLOC_FREE( newparentinfo->subkey_cache );
result = write_result ? WERR_OK : WERR_REG_IO_FAILURE; result = write_result ? WERR_OK : WERR_REG_IO_FAILURE;