diff options
author | Günther Deschner <gd@samba.org> | 2015-12-03 15:24:11 +0100 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2016-09-28 00:04:17 +0200 |
commit | 22a514f9929e830f0484182cc5f29b19bd6421f2 (patch) | |
tree | be2d2c7c6e7b2bf638316fd30d8545da1388462e /source3/registry | |
parent | 8ec9d694fa37cae56cf4035769eea04afc1b1bd0 (diff) | |
download | samba-22a514f9929e830f0484182cc5f29b19bd6421f2.tar.gz |
werror: replace WERR_BADFILE with WERR_FILE_NOT_FOUND in source3/registry/
Guenther
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/registry')
-rw-r--r-- | source3/registry/reg_api.c | 20 | ||||
-rw-r--r-- | source3/registry/reg_api_regf.c | 4 | ||||
-rw-r--r-- | source3/registry/reg_backend_db.c | 6 | ||||
-rw-r--r-- | source3/registry/reg_import.c | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c index 586bf03643a..16ff8337914 100644 --- a/source3/registry/reg_api.c +++ b/source3/registry/reg_api.c @@ -96,7 +96,7 @@ static WERROR fill_value_cache(struct registry_key *key) if (fetch_reg_values(key->key, key->values) == -1) { TALLOC_FREE(key->values); - return WERR_BADFILE; + return WERR_FILE_NOT_FOUND; } return WERR_OK; @@ -118,7 +118,7 @@ static WERROR fill_subkey_cache(struct registry_key *key) if (fetch_reg_keys(key->key, key->subkeys) == -1) { TALLOC_FREE(key->subkeys); - return WERR_BADFILE; + return WERR_FILE_NOT_FOUND; } return WERR_OK; @@ -169,7 +169,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx, * Open a copy of the parent key */ if (!parent) { - result = WERR_BADFILE; + result = WERR_FILE_NOT_FOUND; goto done; } key->name = talloc_strdup(key, parent->key->name); @@ -200,7 +200,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx, if (key->ops == NULL) { DEBUG(0,("reg_open_onelevel: Failed to assign " "registry_ops to [%s]\n", key->name )); - result = WERR_BADFILE; + result = WERR_FILE_NOT_FOUND; goto done; } @@ -239,7 +239,7 @@ WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive, hi = hive_info(hive); if (hi == NULL) { - return WERR_BADFILE; + return WERR_FILE_NOT_FOUND; } return regkey_open_onelevel(mem_ctx, NULL, hi->short_name, token, @@ -441,7 +441,7 @@ WERROR reg_queryvalue(TALLOC_CTX *mem_ctx, struct registry_key *key, } } - return WERR_BADFILE; + return WERR_FILE_NOT_FOUND; } WERROR reg_querymultiplevalues(TALLOC_CTX *mem_ctx, @@ -512,7 +512,7 @@ WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys, if (!W_ERROR_IS_OK(fill_subkey_cache(key)) || !W_ERROR_IS_OK(fill_value_cache(key))) { - return WERR_BADFILE; + return WERR_FILE_NOT_FOUND; } max_len = 0; @@ -618,7 +618,7 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent, goto trans_done; } - if (!W_ERROR_EQUAL(err, WERR_BADFILE)) { + if (!W_ERROR_EQUAL(err, WERR_FILE_NOT_FOUND)) { /* * Something but "notfound" has happened, so bail out */ @@ -833,7 +833,7 @@ static WERROR reg_value_exists(struct registry_key *key, const char *name) blob = regval_ctr_getvalue(key->values, name); if (blob == NULL) { - return WERR_BADFILE; + return WERR_FILE_NOT_FOUND; } else { return WERR_OK; } @@ -1018,7 +1018,7 @@ static WERROR reg_deletekey_recursive_trans(struct registry_key *parent, if (!W_ERROR_IS_OK(werr)) { WERROR werr2; - DEBUG(W_ERROR_EQUAL(werr, WERR_BADFILE) ? 5 : 1, + DEBUG(W_ERROR_EQUAL(werr, WERR_FILE_NOT_FOUND) ? 5 : 1, (__location__ ": failed to delete key '%s' from key " "'%s': %s\n", path, parent->key->name, win_errstr(werr))); diff --git a/source3/registry/reg_api_regf.c b/source3/registry/reg_api_regf.c index 97eab03a706..560209e62d7 100644 --- a/source3/registry/reg_api_regf.c +++ b/source3/registry/reg_api_regf.c @@ -52,7 +52,7 @@ static WERROR reg_load_tree(REGF_FILE *regfile, const char *topkeypath, if (!registry_key.ops) { DEBUG(0, ("reg_load_tree: Failed to assign registry_ops " "to [%s]\n", topkeypath)); - return WERR_BADFILE; + return WERR_FILE_NOT_FOUND; } registry_key.name = talloc_strdup(regfile->mem_ctx, topkeypath); @@ -216,7 +216,7 @@ static WERROR reg_write_tree(REGF_FILE *regfile, const char *keypath, registry_key.ops = reghook_cache_find(registry_key.name); if (registry_key.ops == NULL) { - return WERR_BADFILE; + return WERR_FILE_NOT_FOUND; } /* lookup the values and subkeys */ diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index 45d74d5c0f8..f460c9dd7b7 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -2089,7 +2089,7 @@ static WERROR regdb_get_secdesc(TALLOC_CTX *mem_ctx, const char *key, DEBUG(10, ("regdb_get_secdesc: Getting secdesc of key [%s]\n", key)); if (!regdb_key_exists(regdb, key)) { - err = WERR_BADFILE; + err = WERR_FILE_NOT_FOUND; goto done; } @@ -2107,7 +2107,7 @@ static WERROR regdb_get_secdesc(TALLOC_CTX *mem_ctx, const char *key, status = dbwrap_fetch_bystring(regdb, tmp_ctx, tdbkey, &data); if (!NT_STATUS_IS_OK(status)) { - err = WERR_BADFILE; + err = WERR_FILE_NOT_FOUND; goto done; } @@ -2178,7 +2178,7 @@ static WERROR regdb_set_secdesc(const char *key, struct regdb_set_secdesc_ctx ctx; if (!regdb_key_exists(regdb, key)) { - err = WERR_BADFILE; + err = WERR_FILE_NOT_FOUND; goto done; } diff --git a/source3/registry/reg_import.c b/source3/registry/reg_import.c index 8bcce6855e1..5fb19ee4566 100644 --- a/source3/registry/reg_import.c +++ b/source3/registry/reg_import.c @@ -78,7 +78,7 @@ int reg_parse_callback_key(struct reg_import *p, if (del) { werr = p->call.deletekey(p->call.data, NULL, key[0]); - if (W_ERROR_EQUAL(werr, WERR_BADFILE)) { + if (W_ERROR_EQUAL(werr, WERR_FILE_NOT_FOUND)) { /* the key didn't exist, treat as success */ werr = WERR_OK; } |