diff options
| author | Gerald Carter <jerry@samba.org> | 2005-09-30 17:13:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:04:48 -0500 |
| commit | 54abd2aa66069e6baf7769c496f46d9dba18db39 (patch) | |
| tree | 9cf8e88168011797319ba9e9866749201b1eac1e /source3/registry/reg_db.c | |
| parent | 4a2cc231d22a82ed21771a72508f15d21ed63227 (diff) | |
| download | samba-54abd2aa66069e6baf7769c496f46d9dba18db39.tar.gz samba-54abd2aa66069e6baf7769c496f46d9dba18db39.tar.bz2 samba-54abd2aa66069e6baf7769c496f46d9dba18db39.zip | |
r10656: BIG merge from trunk. Features not copied over
* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
(This used to be commit 939c3cb5d78e3a2236209b296aa8aba8bdce32d3)
Diffstat (limited to 'source3/registry/reg_db.c')
| -rw-r--r-- | source3/registry/reg_db.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source3/registry/reg_db.c b/source3/registry/reg_db.c index afb5c613c8..ab8fc14d90 100644 --- a/source3/registry/reg_db.c +++ b/source3/registry/reg_db.c @@ -92,18 +92,10 @@ static BOOL init_registry_data( void ) fstring keyname, subkeyname; REGSUBKEY_CTR *subkeys; REGVAL_CTR *values; - uint32 *ctx; int i; const char *p, *p2; UNISTR2 data; - /* create a new top level talloc ctx */ - - if ( !(ctx = TALLOC_P( NULL, uint32 )) ) { - DEBUG(0,("init_registry_data: top level talloc() failure!\n")); - return False; - } - /* loop over all of the predefined paths and add each component */ for ( i=0; builtin_registry_paths[i] != NULL; i++ ) { @@ -140,7 +132,7 @@ static BOOL init_registry_data( void ) we are about to update the record. We just want any subkeys already present */ - if ( !(subkeys = TALLOC_ZERO_P( ctx, REGSUBKEY_CTR )) ) { + if ( !(subkeys = TALLOC_ZERO_P( NULL, REGSUBKEY_CTR )) ) { DEBUG(0,("talloc() failure!\n")); return False; } @@ -158,7 +150,7 @@ static BOOL init_registry_data( void ) /* loop over all of the predefined values and add each component */ for ( i=0; builtin_registry_values[i].path != NULL; i++ ) { - if ( !(values = TALLOC_ZERO_P( ctx, REGVAL_CTR )) ) { + if ( !(values = TALLOC_ZERO_P( NULL, REGVAL_CTR )) ) { DEBUG(0,("talloc() failure!\n")); return False; } |