s3:registry: rename regval_ctr_key_exists() to regval_ctr_value_exists() (cherry...

diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 11bbe7ed36a30d1bbb3c7b317c66b27751f1ef2b..f65f26df36ac3e083bc11273876a105fddd49f87 100644 (file)
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -320,7 +320,7 @@ static NTSTATUS init_registry_data_action(struct db_context *db,
 
                /* preserve existing values across restarts. Only add new ones */
 
-               if (!regval_ctr_key_exists(values,
+               if (!regval_ctr_value_exists(values,
                                        builtin_registry_values[i].valuename))
                {
                        regdb_ctr_add_value(values,
@@ -364,7 +364,7 @@ WERROR init_registry_data(void)
                regdb_fetch_values_internal(regdb,
                                            builtin_registry_values[i].path,
                                            values);
-               if (!regval_ctr_key_exists(values,
+               if (!regval_ctr_value_exists(values,
                                        builtin_registry_values[i].valuename))
                {
                        TALLOC_FREE(values);

diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index 980986f95bf1a52a354fcb0195da7973ce549ccb..de0de2c5d0c383c4ab6b69fefe14a1dee85a941b 100644 (file)
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -446,7 +446,7 @@ struct regval_blob *regval_ctr_specific_value(struct regval_ctr *ctr,
  Check for the existance of a value
  **********************************************************************/
 
-bool regval_ctr_key_exists(struct regval_ctr *ctr, const char *value)
+bool regval_ctr_value_exists(struct regval_ctr *ctr, const char *value)
 {
        int     i;
 

diff --git a/source3/registry/reg_objects.h b/source3/registry/reg_objects.h
index a84bc8a80bcb4ae596595673f191c2656d3e5719..0599bfeedd4ee2a4a62d1ca8e365755c63634daf 100644 (file)
--- a/source3/registry/reg_objects.h
+++ b/source3/registry/reg_objects.h
@@ -55,7 +55,7 @@ char* regval_name(struct regval_blob *val);
 uint32_t regval_type(struct regval_blob *val);
 struct regval_blob* regval_ctr_specific_value(struct regval_ctr *ctr,
                                              uint32_t idx);
-bool regval_ctr_key_exists(struct regval_ctr *ctr, const char *value);
+bool regval_ctr_value_exists(struct regval_ctr *ctr, const char *value);
 struct regval_blob *regval_compose(TALLOC_CTX *ctx, const char *name,
                                   uint32_t type,
                                   const uint8_t *data_p, size_t size);