diff options
| author | Michael Adam <obnox@samba.org> | 2008-03-22 01:49:21 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-03-22 01:49:21 +0100 |
| commit | e12ed5279a2e34ae9d7fc2b32c853615e8f9f592 (patch) | |
| tree | 36bda90ca25055a44fdb5005d8baec5072a1b4b1 /source3/registry/reg_init_full.c | |
| parent | 9ec7af58c62d8ead447fc6da6db76db8dc5b96dc (diff) | |
| download | samba-e12ed5279a2e34ae9d7fc2b32c853615e8f9f592.tar.gz samba-e12ed5279a2e34ae9d7fc2b32c853615e8f9f592.tar.bz2 samba-e12ed5279a2e34ae9d7fc2b32c853615e8f9f592.zip | |
registry: close regdb in error path (and use it) in init_registry().
Michael
(This used to be commit 73b325fe7a9d7fd67ac9b99144a3776f5a1a9e15)
Diffstat (limited to 'source3/registry/reg_init_full.c')
| -rw-r--r-- | source3/registry/reg_init_full.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c index 5c59c6ba96..f9c982027e 100644 --- a/source3/registry/reg_init_full.c +++ b/source3/registry/reg_init_full.c @@ -78,7 +78,7 @@ bool init_registry( void ) if ( !init_registry_data() ) { DEBUG(0,("regdb_init: Failed to initialize data in registry!\n")); - return false; + goto fail; } /* build the cache tree of registry hooks */ @@ -99,12 +99,11 @@ bool init_registry( void ) eventlog_init_keys(); perfcount_init_keys(); - /* close and let each smbd open up as necessary */ - - regdb_close(); ret = true; fail: + /* close and let each smbd open up as necessary */ + regdb_close(); TALLOC_FREE(frame); return ret; } |