summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/include/reg_objects.h8
-rw-r--r--source3/lib/util_reg.c2
-rw-r--r--source3/registry/reg_api.c4
-rw-r--r--source3/registry/reg_backend_current_version.c4
-rw-r--r--source3/registry/reg_backend_db.c2
-rw-r--r--source3/registry/reg_backend_hkpt_params.c4
-rw-r--r--source3/registry/reg_backend_netlogon_params.c4
-rw-r--r--source3/registry/reg_backend_perflib.c4
-rw-r--r--source3/registry/reg_backend_printing.c2
-rw-r--r--source3/registry/reg_backend_prod_options.c4
-rw-r--r--source3/registry/reg_backend_shares.c2
-rw-r--r--source3/registry/reg_backend_smbconf.c4
-rw-r--r--source3/registry/reg_backend_tcpip_params.c4
-rw-r--r--source3/registry/reg_cachehook.c10
-rw-r--r--source3/registry/reg_init_full.c22
-rw-r--r--source3/registry/reg_init_smbconf.c2
17 files changed, 43 insertions, 43 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 83436a370ef..101831577f8 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4853,8 +4853,8 @@ bool regdb_values_need_update(struct regval_ctr *values);
/* The following definitions come from registry/reg_cachehook.c */
WERROR reghook_cache_init(void);
-WERROR reghook_cache_add(const char *keyname, REGISTRY_OPS *ops);
-REGISTRY_OPS *reghook_cache_find(const char *keyname);
+WERROR reghook_cache_add(const char *keyname, struct registry_ops *ops);
+struct registry_ops *reghook_cache_find(const char *keyname);
void reghook_dump_cache( int debuglevel );
/* The following definitions come from registry/reg_dispatcher.c */
diff --git a/source3/include/reg_objects.h b/source3/include/reg_objects.h
index 5a4f5164025..8d220ebdf58 100644
--- a/source3/include/reg_objects.h
+++ b/source3/include/reg_objects.h
@@ -126,7 +126,7 @@ struct regsubkey_ctr;
* for virtual registry view
*/
-typedef struct {
+struct registry_ops {
/* functions for enumerating subkeys and values */
int (*fetch_subkeys)( const char *key, struct regsubkey_ctr *subkeys);
int (*fetch_values) ( const char *key, struct regval_ctr *val );
@@ -143,11 +143,11 @@ typedef struct {
struct security_descriptor *sec_desc);
bool (*subkeys_need_update)(struct regsubkey_ctr *subkeys);
bool (*values_need_update)(struct regval_ctr *values);
-} REGISTRY_OPS;
+};
struct registry_hook {
const char *keyname; /* full path to name of key */
- REGISTRY_OPS *ops; /* registry function hooks */
+ struct registry_ops *ops; /* registry function hooks */
};
@@ -157,7 +157,7 @@ struct registry_key_handle {
uint32 type;
char *name; /* full name of registry key */
uint32 access_granted;
- REGISTRY_OPS *ops;
+ struct registry_ops *ops;
};
struct registry_key {
diff --git a/source3/lib/util_reg.c b/source3/lib/util_reg.c
index 96717e33d33..1e1bcfeb103 100644
--- a/source3/lib/util_reg.c
+++ b/source3/lib/util_reg.c
@@ -22,7 +22,7 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
-extern REGISTRY_OPS smbconf_reg_ops;
+extern struct registry_ops smbconf_reg_ops;
const char *reg_type_lookup(enum winreg_Type type)
{
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 6dfda13e338..9aff4b05ca8 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -187,7 +187,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
if ( !(key->ops = reghook_cache_find( key->name )) ) {
DEBUG(0,("reg_open_onelevel: Failed to assign "
- "REGISTRY_OPS to [%s]\n", key->name ));
+ "registry_ops to [%s]\n", key->name ));
result = WERR_BADFILE;
goto done;
}
@@ -721,7 +721,7 @@ static WERROR reg_load_tree(REGF_FILE *regfile, const char *topkeypath,
registry_key.ops = reghook_cache_find(topkeypath);
if (!registry_key.ops) {
- DEBUG(0, ("reg_load_tree: Failed to assign REGISTRY_OPS "
+ DEBUG(0, ("reg_load_tree: Failed to assign registry_ops "
"to [%s]\n", topkeypath));
return WERR_BADFILE;
}
diff --git a/source3/registry/reg_backend_current_version.c b/source3/registry/reg_backend_current_version.c
index c1b32110531..1a3b2819a68 100644
--- a/source3/registry/reg_backend_current_version.c
+++ b/source3/registry/reg_backend_current_version.c
@@ -29,7 +29,7 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
-extern REGISTRY_OPS regdb_ops;
+extern struct registry_ops regdb_ops;
#define KEY_CURRENT_VERSION_NORM "HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION"
@@ -75,7 +75,7 @@ static int current_version_fetch_subkeys(const char *key,
return regdb_ops.fetch_subkeys(key, subkey_ctr);
}
-REGISTRY_OPS current_version_reg_ops = {
+struct registry_ops current_version_reg_ops = {
.fetch_values = current_version_fetch_values,
.fetch_subkeys = current_version_fetch_subkeys,
};
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 5229f154acf..e296d319e29 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -1667,7 +1667,7 @@ bool regdb_values_need_update(struct regval_ctr *values)
* Table of function pointers for default access
*/
-REGISTRY_OPS regdb_ops = {
+struct registry_ops regdb_ops = {
.fetch_subkeys = regdb_fetch_keys,
.fetch_values = regdb_fetch_values,
.store_subkeys = regdb_store_keys,
diff --git a/source3/registry/reg_backend_hkpt_params.c b/source3/registry/reg_backend_hkpt_params.c
index 565198df4b2..ca37b595226 100644
--- a/source3/registry/reg_backend_hkpt_params.c
+++ b/source3/registry/reg_backend_hkpt_params.c
@@ -29,7 +29,7 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
-extern REGISTRY_OPS regdb_ops;
+extern struct registry_ops regdb_ops;
static int hkpt_params_fetch_values(const char *key, struct regval_ctr *regvals)
{
@@ -64,7 +64,7 @@ static int hkpt_params_fetch_subkeys(const char *key,
return regdb_ops.fetch_subkeys(key, subkey_ctr);
}
-REGISTRY_OPS hkpt_params_reg_ops = {
+struct registry_ops hkpt_params_reg_ops = {
.fetch_values = hkpt_params_fetch_values,
.fetch_subkeys = hkpt_params_fetch_subkeys,
};
diff --git a/source3/registry/reg_backend_netlogon_params.c b/source3/registry/reg_backend_netlogon_params.c
index 3d8a18c9f6f..682c7fe9a57 100644
--- a/source3/registry/reg_backend_netlogon_params.c
+++ b/source3/registry/reg_backend_netlogon_params.c
@@ -29,7 +29,7 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
-extern REGISTRY_OPS regdb_ops;
+extern struct registry_ops regdb_ops;
static int netlogon_params_fetch_values(const char *key, struct regval_ctr *regvals)
{
@@ -51,7 +51,7 @@ static int netlogon_params_fetch_subkeys(const char *key,
return regdb_ops.fetch_subkeys(key, subkey_ctr);
}
-REGISTRY_OPS netlogon_params_reg_ops = {
+struct registry_ops netlogon_params_reg_ops = {
.fetch_values = netlogon_params_fetch_values,
.fetch_subkeys = netlogon_params_fetch_subkeys,
};
diff --git a/source3/registry/reg_backend_perflib.c b/source3/registry/reg_backend_perflib.c
index 3a098f3ba89..54e6cfe9222 100644
--- a/source3/registry/reg_backend_perflib.c
+++ b/source3/registry/reg_backend_perflib.c
@@ -29,7 +29,7 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
-extern REGISTRY_OPS regdb_ops;
+extern struct registry_ops regdb_ops;
#define KEY_PERFLIB_NORM "HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PERFLIB"
#define KEY_PERFLIB_009_NORM "HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PERFLIB/009"
@@ -100,7 +100,7 @@ static int perflib_fetch_subkeys(const char *key,
return regdb_ops.fetch_subkeys(key, subkey_ctr);
}
-REGISTRY_OPS perflib_reg_ops = {
+struct registry_ops perflib_reg_ops = {
.fetch_values = perflib_fetch_values,
.fetch_subkeys = perflib_fetch_subkeys,
};
diff --git a/source3/registry/reg_backend_printing.c b/source3/registry/reg_backend_printing.c
index 0854d7d8fc5..4465d2e2e13 100644
--- a/source3/registry/reg_backend_printing.c
+++ b/source3/registry/reg_backend_printing.c
@@ -1258,7 +1258,7 @@ static bool regprint_store_reg_values(const char *key, struct regval_ctr *values
* Table of function pointers for accessing printing data
*/
-REGISTRY_OPS printing_ops = {
+struct registry_ops printing_ops = {
.fetch_subkeys = regprint_fetch_reg_keys,
.fetch_values = regprint_fetch_reg_values,
.store_subkeys = regprint_store_reg_keys,
diff --git a/source3/registry/reg_backend_prod_options.c b/source3/registry/reg_backend_prod_options.c
index dc6b987f9d8..cdc1f37e728 100644
--- a/source3/registry/reg_backend_prod_options.c
+++ b/source3/registry/reg_backend_prod_options.c
@@ -29,7 +29,7 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
-extern REGISTRY_OPS regdb_ops;
+extern struct registry_ops regdb_ops;
static int prod_options_fetch_values(const char *key, struct regval_ctr *regvals)
{
@@ -64,7 +64,7 @@ static int prod_options_fetch_subkeys(const char *key,
return regdb_ops.fetch_subkeys(key, subkey_ctr);
}
-REGISTRY_OPS prod_options_reg_ops = {
+struct registry_ops prod_options_reg_ops = {
.fetch_values = prod_options_fetch_values,
.fetch_subkeys = prod_options_fetch_subkeys,
};
diff --git a/source3/registry/reg_backend_shares.c b/source3/registry/reg_backend_shares.c
index 562fd7b4ffa..19774060491 100644
--- a/source3/registry/reg_backend_shares.c
+++ b/source3/registry/reg_backend_shares.c
@@ -154,7 +154,7 @@ static bool shares_store_value(const char *key, struct regval_ctr *val)
* Table of function pointers for accessing printing data
*/
-REGISTRY_OPS shares_reg_ops = {
+struct registry_ops shares_reg_ops = {
.fetch_subkeys = shares_subkey_info,
.fetch_values = shares_value_info,
.store_subkeys = shares_store_subkey,
diff --git a/source3/registry/reg_backend_smbconf.c b/source3/registry/reg_backend_smbconf.c
index e8ac967e44d..15993438a94 100644
--- a/source3/registry/reg_backend_smbconf.c
+++ b/source3/registry/reg_backend_smbconf.c
@@ -23,7 +23,7 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
-extern REGISTRY_OPS regdb_ops; /* these are the default */
+extern struct registry_ops regdb_ops; /* these are the default */
static int smbconf_fetch_keys( const char *key, struct regsubkey_ctr *subkey_ctr )
{
@@ -84,7 +84,7 @@ static WERROR smbconf_set_secdesc(const char *key,
* Table of function pointers for accessing smb.conf data
*/
-REGISTRY_OPS smbconf_reg_ops = {
+struct registry_ops smbconf_reg_ops = {
.fetch_subkeys = smbconf_fetch_keys,
.fetch_values = smbconf_fetch_values,
.store_subkeys = smbconf_store_keys,
diff --git a/source3/registry/reg_backend_tcpip_params.c b/source3/registry/reg_backend_tcpip_params.c
index f5311b733c9..30f7f719382 100644
--- a/source3/registry/reg_backend_tcpip_params.c
+++ b/source3/registry/reg_backend_tcpip_params.c
@@ -29,7 +29,7 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
-extern REGISTRY_OPS regdb_ops;
+extern struct registry_ops regdb_ops;
static int tcpip_params_fetch_values(const char *key, struct regval_ctr *regvals)
{
@@ -61,7 +61,7 @@ static int tcpip_params_fetch_subkeys(const char *key,
return regdb_ops.fetch_subkeys(key, subkey_ctr);
}
-REGISTRY_OPS tcpip_params_reg_ops = {
+struct registry_ops tcpip_params_reg_ops = {
.fetch_values = tcpip_params_fetch_values,
.fetch_subkeys = tcpip_params_fetch_subkeys,
};
diff --git a/source3/registry/reg_cachehook.c b/source3/registry/reg_cachehook.c
index 6697a69356b..4f84de52860 100644
--- a/source3/registry/reg_cachehook.c
+++ b/source3/registry/reg_cachehook.c
@@ -26,7 +26,7 @@
#define DBGC_CLASS DBGC_REGISTRY
static SORTED_TREE *cache_tree = NULL;
-extern REGISTRY_OPS regdb_ops; /* these are the default */
+extern struct registry_ops regdb_ops; /* these are the default */
static WERROR keyname_to_path(TALLOC_CTX *mem_ctx, const char *keyname,
char **path)
@@ -79,7 +79,7 @@ WERROR reghook_cache_init(void)
is not in the exact format that a SORTED_TREE expects.
*********************************************************************/
-WERROR reghook_cache_add(const char *keyname, REGISTRY_OPS *ops)
+WERROR reghook_cache_add(const char *keyname, struct registry_ops *ops)
{
WERROR werr;
char *key = NULL;
@@ -107,11 +107,11 @@ done:
Find a key in the cache.
*********************************************************************/
-REGISTRY_OPS *reghook_cache_find(const char *keyname)
+struct registry_ops *reghook_cache_find(const char *keyname)
{
WERROR werr;
char *key = NULL;
- REGISTRY_OPS *ops = NULL;
+ struct registry_ops *ops = NULL;
if (keyname == NULL) {
return NULL;
@@ -124,7 +124,7 @@ REGISTRY_OPS *reghook_cache_find(const char *keyname)
DEBUG(10,("reghook_cache_find: Searching for keyname [%s]\n", key));
- ops = (REGISTRY_OPS *)pathtree_find(cache_tree, key);
+ ops = (struct registry_ops *)pathtree_find(cache_tree, key);
DEBUG(10, ("reghook_cache_find: found ops %p for key [%s]\n",
ops ? (void *)ops : 0, key));
diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c
index 206dcd140bf..d05a74ef352 100644
--- a/source3/registry/reg_init_full.c
+++ b/source3/registry/reg_init_full.c
@@ -25,17 +25,17 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
-extern REGISTRY_OPS printing_ops;
-extern REGISTRY_OPS eventlog_ops;
-extern REGISTRY_OPS shares_reg_ops;
-extern REGISTRY_OPS smbconf_reg_ops;
-extern REGISTRY_OPS netlogon_params_reg_ops;
-extern REGISTRY_OPS prod_options_reg_ops;
-extern REGISTRY_OPS tcpip_params_reg_ops;
-extern REGISTRY_OPS hkpt_params_reg_ops;
-extern REGISTRY_OPS current_version_reg_ops;
-extern REGISTRY_OPS perflib_reg_ops;
-extern REGISTRY_OPS regdb_ops; /* these are the default */
+extern struct registry_ops printing_ops;
+extern struct registry_ops eventlog_ops;
+extern struct registry_ops shares_reg_ops;
+extern struct registry_ops smbconf_reg_ops;
+extern struct registry_ops netlogon_params_reg_ops;
+extern struct registry_ops prod_options_reg_ops;
+extern struct registry_ops tcpip_params_reg_ops;
+extern struct registry_ops hkpt_params_reg_ops;
+extern struct registry_ops current_version_reg_ops;
+extern struct registry_ops perflib_reg_ops;
+extern struct registry_ops regdb_ops; /* these are the default */
/* array of registry_hook's which are read into a tree for easy access */
/* #define REG_TDB_ONLY 1 */
diff --git a/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c
index 7ba53cd367e..28c4187784d 100644
--- a/source3/registry/reg_init_smbconf.c
+++ b/source3/registry/reg_init_smbconf.c
@@ -22,7 +22,7 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_REGISTRY
-extern REGISTRY_OPS smbconf_reg_ops;
+extern struct registry_ops smbconf_reg_ops;
/*
* create a fake token just with enough rights to
generated by cgit (git 2.34.1) at 2024-11-15 23:26:23 +0000