diff options
author | Michael Adam <obnox@samba.org> | 2008-04-13 13:38:44 +0200 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2008-04-13 15:33:47 +0200 |
commit | 26a5652f6d1dc7ae01a472beabf032faba07c8d2 (patch) | |
tree | 5e2fd68d28cca732e4d943024b50e4a521f58bc6 /source3 | |
parent | cb624c40573b10fbb93c14a1aa436780ffd6caa4 (diff) | |
download | samba-26a5652f6d1dc7ae01a472beabf032faba07c8d2.tar.gz samba-26a5652f6d1dc7ae01a472beabf032faba07c8d2.tar.bz2 samba-26a5652f6d1dc7ae01a472beabf032faba07c8d2.zip |
registry: change init_registry_key() and init_registry_data() to return WERR
Michael
(This used to be commit e0718f04a7392695eed6cd1bf888d3af1d5d6177)
Diffstat (limited to 'source3')
-rw-r--r-- | source3/registry/reg_backend_db.c | 52 | ||||
-rw-r--r-- | source3/registry/reg_init_full.c | 3 | ||||
-rw-r--r-- | source3/registry/reg_init_smbconf.c | 8 |
3 files changed, 43 insertions, 20 deletions
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index e30d269721..31a8f77614 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -91,9 +91,9 @@ static struct builtin_regkey_value builtin_registry_values[] = { * Initialize a key in the registry: * create each component key of the specified path. */ -static bool init_registry_key_internal(const char *add_path) +static WERROR init_registry_key_internal(const char *add_path) { - bool ret = false; + WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); char *path = NULL; char *base = NULL; @@ -108,6 +108,7 @@ static bool init_registry_key_internal(const char *add_path) path = talloc_strdup(frame, add_path); base = talloc_strdup(frame, ""); if (!path || !base) { + werr = WERR_NOMEM; goto fail; } p = path; @@ -119,11 +120,13 @@ static bool init_registry_key_internal(const char *add_path) if (*base) { base = talloc_asprintf(frame, "%s\\", base); if (!base) { + werr = WERR_NOMEM; goto fail; } } base = talloc_asprintf_append(base, "%s", keyname); if (!base) { + werr = WERR_NOMEM; goto fail; } @@ -131,11 +134,13 @@ static bool init_registry_key_internal(const char *add_path) subkeyname = talloc_strdup(frame, ""); if (!subkeyname) { + werr = WERR_NOMEM; goto fail; } if (*p) { remaining = talloc_strdup(frame, p); if (!remaining) { + werr = WERR_NOMEM; goto fail; } p2 = remaining; @@ -145,6 +150,7 @@ static bool init_registry_key_internal(const char *add_path) { subkeyname = talloc_strdup(frame,p2); if (!subkeyname) { + werr = WERR_NOMEM; goto fail; } } @@ -160,22 +166,28 @@ static bool init_registry_key_internal(const char *add_path) if (!(subkeys = TALLOC_ZERO_P(frame, REGSUBKEY_CTR))) { DEBUG(0,("talloc() failure!\n")); + werr = WERR_NOMEM; goto fail; } regdb_fetch_keys(base, subkeys); if (*subkeyname) { - regsubkey_ctr_addkey( subkeys, subkeyname); + werr = regsubkey_ctr_addkey(subkeys, subkeyname); + if (!W_ERROR_IS_OK(werr)) { + goto fail; + } } if (!regdb_store_keys( base, subkeys)) { + werr = WERR_CAN_NOT_COMPLETE; goto fail; } } - ret = true; + werr = WERR_OK; + fail: TALLOC_FREE(frame); - return ret; + return werr; } /** @@ -183,38 +195,42 @@ fail: * create each component key of the specified path, * wrapped in one db transaction. */ -bool init_registry_key(const char *add_path) +WERROR init_registry_key(const char *add_path) { + WERROR werr; + if (regdb->transaction_start(regdb) != 0) { DEBUG(0, ("init_registry_key: transaction_start failed\n")); - return false; + return WERR_REG_IO_FAILURE; } - if (!init_registry_key_internal(add_path)) { + werr = init_registry_key_internal(add_path); + if (!W_ERROR_IS_OK(werr)) { goto fail; } if (regdb->transaction_commit(regdb) != 0) { DEBUG(0, ("init_registry_key: Could not commit transaction\n")); - return false; + return WERR_REG_IO_FAILURE; } - return true; + return WERR_OK; fail: if (regdb->transaction_cancel(regdb) != 0) { smb_panic("init_registry_key: transaction_cancel failed\n"); } - return false; + return werr; } /*********************************************************************** Open the registry data in the tdb ***********************************************************************/ -bool init_registry_data(void) +WERROR init_registry_data(void) { + WERROR werr; TALLOC_CTX *frame = NULL; REGVAL_CTR *values; int i; @@ -231,13 +247,14 @@ bool init_registry_data(void) if (regdb->transaction_start(regdb) != 0) { DEBUG(0, ("init_registry_data: tdb_transaction_start " "failed\n")); - return false; + return WERR_REG_IO_FAILURE; } /* loop over all of the predefined paths and add each component */ for (i=0; builtin_registry_paths[i] != NULL; i++) { - if (!init_registry_key_internal(builtin_registry_paths[i])) { + werr = init_registry_key_internal(builtin_registry_paths[i]); + if (!W_ERROR_IS_OK(werr)) { goto fail; } } @@ -250,6 +267,7 @@ bool init_registry_data(void) values = TALLOC_ZERO_P(frame, REGVAL_CTR); if (values == NULL) { + werr = WERR_NOMEM; goto fail; } @@ -297,10 +315,10 @@ bool init_registry_data(void) if (regdb->transaction_commit(regdb) != 0) { DEBUG(0, ("init_registry_data: Could not commit " "transaction\n")); - return false; + return WERR_REG_IO_FAILURE; } - return true; + return WERR_OK; fail: @@ -311,7 +329,7 @@ bool init_registry_data(void) "failed\n"); } - return false; + return werr; } /*********************************************************************** diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c index 04eff36057..ac3f66f1b2 100644 --- a/source3/registry/reg_init_full.c +++ b/source3/registry/reg_init_full.c @@ -77,7 +77,8 @@ bool init_registry( void ) /* setup the necessary keys and values */ - if ( !init_registry_data() ) { + werr = init_registry_data(); + if (!W_ERROR_IS_OK(werr)) { DEBUG(0, ("Failed to initialize data in registry!\n")); goto fail; } diff --git a/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c index 670f7a9c5d..871141c1fd 100644 --- a/source3/registry/reg_init_smbconf.c +++ b/source3/registry/reg_init_smbconf.c @@ -86,10 +86,14 @@ bool registry_init_smbconf(const char *keyname) dos_errstr(werr))); goto done; } - if (!init_registry_key(keyname)) { - DEBUG(1, ("Failed to initialize registry key '%s'\n", keyname)); + + werr = init_registry_key(keyname); + if (!W_ERROR_IS_OK(werr)) { + DEBUG(1, ("Failed to initialize registry key '%s': %s\n", + keyname, dos_errstr(werr))); goto done; } + reghook_cache_init(); if (!reghook_cache_add(keyname, &smbconf_reg_ops)) { DEBUG(1, ("Failed to add smbconf reghooks to reghook cache\n")); |