Add a registry backend hkpt_params that replaces the former dynamic overlay.

Michael

diff --git a/source/Makefile.in b/source/Makefile.in
index 7416ee2b3cab6b2caccf79ee632ce43556064280..0def36dd64a81d69d5b9598f2d8463e14e1bed7b 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -421,6 +421,7 @@ REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_pri
               registry/reg_backend_netlogon_params.o \
               registry/reg_backend_prod_options.o \
               registry/reg_backend_tcpip_params.o \
+              registry/reg_backend_hkpt_params.o \
               $(UTIL_REG_API_OBJ) $(UTIL_REG_SMBCONF_OBJ)
 
 RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o

diff --git a/source/registry/reg_backend_hkpt_params.c b/source/registry/reg_backend_hkpt_params.c
new file mode 100644 (file)
index 0000000..0b962e1
--- /dev/null
+++ b/source/registry/reg_backend_hkpt_params.c
@@ -0,0 +1,67 @@
+/*
+ *  Unix SMB/CIFS implementation.
+ *  Virtual Windows Registry Layer
+ *  Copyright (C) Gerald Carter     2002-2005
+ *  Copyright (C) Michael Adam      2008
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * HKPT parameters registry backend.
+ *
+ * This replaces the former dynamic hkpt parameters overlay.
+ */
+
+#include "includes.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_REGISTRY
+
+extern REGISTRY_OPS regdb_ops;
+
+static int hkpt_params_fetch_values(const char *key, REGVAL_CTR *regvals)
+{
+       uint32 base_index;
+       uint32 buffer_size;
+       char *buffer = NULL;
+
+       /* This is ALMOST the same as perflib_009_params, but HKPT has
+          a "Counters" entry instead of a "Counter" key. <Grrrr> */
+          
+       base_index = reg_perfcount_get_base_index();
+       buffer_size = reg_perfcount_get_counter_names(base_index, &buffer);
+       regval_ctr_addvalue(regvals, "Counters", REG_MULTI_SZ, buffer, buffer_size);
+       
+       if(buffer_size > 0)
+               SAFE_FREE(buffer);
+               
+       buffer_size = reg_perfcount_get_counter_help(base_index, &buffer);
+       regval_ctr_addvalue(regvals, "Help", REG_MULTI_SZ, buffer, buffer_size);
+       if(buffer_size > 0)
+               SAFE_FREE(buffer);
+       
+       return regval_ctr_numvals( regvals );
+}
+
+static int hkpt_params_fetch_subkeys(const char *key,
+                                        REGSUBKEY_CTR *subkey_ctr)
+{
+       return regdb_ops.fetch_subkeys(key, subkey_ctr);
+}
+
+REGISTRY_OPS hkpt_params_reg_ops = {
+       .fetch_values = hkpt_params_fetch_values,
+       .fetch_subkeys = hkpt_params_fetch_subkeys,
+};

diff --git a/source/registry/reg_dynamic.c b/source/registry/reg_dynamic.c
index 9d20b8935cd545b69ee79513d6a6e8c38d0483d4..c342cd07e47ec606652fb5999cb43b011ff95ced 100644 (file)
--- a/source/registry/reg_dynamic.c
+++ b/source/registry/reg_dynamic.c
@@ -75,33 +75,6 @@ static int perflib_009_params( REGVAL_CTR *regvals )
 /***********************************************************************
 ***********************************************************************/
 
-static int hkpt_params( REGVAL_CTR *regvals )
-{
-       uint32 base_index;
-       uint32 buffer_size;
-       char *buffer = NULL;
-
-       /* This is ALMOST the same as perflib_009_params, but HKPT has
-          a "Counters" entry instead of a "Counter" key. <Grrrr> */
-          
-       base_index = reg_perfcount_get_base_index();
-       buffer_size = reg_perfcount_get_counter_names(base_index, &buffer);
-       regval_ctr_addvalue(regvals, "Counters", REG_MULTI_SZ, buffer, buffer_size);
-       
-       if(buffer_size > 0)
-               SAFE_FREE(buffer);
-               
-       buffer_size = reg_perfcount_get_counter_help(base_index, &buffer);
-       regval_ctr_addvalue(regvals, "Help", REG_MULTI_SZ, buffer, buffer_size);
-       if(buffer_size > 0)
-               SAFE_FREE(buffer);
-       
-       return regval_ctr_numvals( regvals );
-}
-
-/***********************************************************************
-***********************************************************************/
-
 static int current_version( REGVAL_CTR *values )
 {
        const char *sysroot_string = "c:\\Windows";
@@ -122,7 +95,6 @@ static int current_version( REGVAL_CTR *values )
        return regval_ctr_numvals( values );
 }
 
-
 /***********************************************************************
  Structure holding the registry paths and pointers to the value 
  enumeration functions
@@ -132,7 +104,6 @@ static struct reg_dyn_values dynamic_values[] = {
        { "HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PERFLIB",  &perflib_params   }, 
        { "HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PERFLIB/009", &perflib_009_params }, 
        { "HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION",          &current_version }, 
-       { "HKPT", &hkpt_params },
        { NULL, NULL }
 };
 

diff --git a/source/registry/reg_frontend.c b/source/registry/reg_frontend.c
index 6ecc8011e4d9dfef251eaa9b8ac076415e150f38..9539c2ba2fd5459141cbf1f6d10c1574d9384568 100644 (file)
--- a/source/registry/reg_frontend.c
+++ b/source/registry/reg_frontend.c
@@ -31,6 +31,7 @@ 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 regdb_ops;         /* these are the default */
 
 /* array of REGISTRY_HOOK's which are read into a tree for easy access */
@@ -46,6 +47,7 @@ REGISTRY_HOOK reg_hooks[] = {
   { KEY_NETLOGON_PARAMS,       &netlogon_params_reg_ops },
   { KEY_PROD_OPTIONS,          &prod_options_reg_ops },
   { KEY_TCPIP_PARAMS,          &tcpip_params_reg_ops },
+  { KEY_HKPT,                  &hkpt_params_reg_ops },
 #endif
   { NULL, NULL }
 };