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

Make sure to only respond to the exact current version key since subkeys
are registered by other backends (printing and - soon - perflib).

Michael
(This used to be commit 2c650bf63ccd9dc5dddbf4700831489544ded055)

5 files changed, 84 insertions, 24 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 0def36dd64..fa40d92948 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -422,6 +422,7 @@ REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_pri
 	       registry/reg_backend_prod_options.o \
 	       registry/reg_backend_tcpip_params.o \
 	       registry/reg_backend_hkpt_params.o \
+	       registry/reg_backend_current_version.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/source3/include/reg_objects.h b/source3/include/reg_objects.h
index e6fbcbdd6d..24db16261d 100644
--- a/source3/include/reg_objects.h
+++ b/source3/include/reg_objects.h
@@ -102,6 +102,7 @@ typedef struct {
 #define KEY_PRINTING 		"HKLM\\SYSTEM\\CurrentControlSet\\Control\\Print"
 #define KEY_PRINTING_2K		"HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print\\Printers"
 #define KEY_PRINTING_PORTS	"HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Ports"
+#define KEY_CURRENT_VERSION	"HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"
 #define KEY_SMBCONF		"HKLM\\SOFTWARE\\Samba\\smbconf"
 #define KEY_TREE_ROOT		""
 
diff --git a/source3/registry/reg_backend_current_version.c b/source3/registry/reg_backend_current_version.c
new file mode 100644
index 0000000000..51b081721c
--- /dev/null
+++ b/source3/registry/reg_backend_current_version.c
@@ -0,0 +1,80 @@
+/*
+ *  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/>.
+ */
+
+/*
+ * CurrentVersion registry backend.
+ *
+ * This is a virtual overlay, dynamically presenting version information.
+ */
+
+#include "includes.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_REGISTRY
+
+extern REGISTRY_OPS regdb_ops;
+
+#define KEY_CURRENT_VERSION_NORM "HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION"
+
+static int current_version_fetch_values(const char *key, REGVAL_CTR *values)
+{
+	const char *sysroot_string = "c:\\Windows";
+	fstring sysversion;
+	fstring value;
+	uint32 value_length;
+	char *path = NULL;
+	TALLOC_CTX *ctx = talloc_tos();
+
+	path = talloc_strdup(ctx, key);
+	if (path == NULL) {
+		return -1;
+	}
+	path = normalize_reg_path(ctx, path);
+	if (path == NULL) {
+		return -1;
+	}
+
+	if (strncmp(path, KEY_CURRENT_VERSION_NORM, strlen(path)) != 0) {
+		return 0;
+	}
+
+	value_length = push_ucs2( value, value, sysroot_string, sizeof(value), 
+		STR_TERMINATE|STR_NOALIGN );
+	regval_ctr_addvalue( values, "SystemRoot", REG_SZ, value, value_length );
+	
+	fstr_sprintf( sysversion, "%d.%d", lp_major_announce_version(), lp_minor_announce_version() );
+	value_length = push_ucs2( value, value, sysversion, sizeof(value), 
+		STR_TERMINATE|STR_NOALIGN );
+	regval_ctr_addvalue( values, "CurrentVersion", REG_SZ, value, value_length );
+	
+		
+	return regval_ctr_numvals( values );
+}
+
+static int current_version_fetch_subkeys(const char *key,
+					 REGSUBKEY_CTR *subkey_ctr)
+{
+	return regdb_ops.fetch_subkeys(key, subkey_ctr);
+}
+
+REGISTRY_OPS current_version_reg_ops = {
+	.fetch_values = current_version_fetch_values,
+	.fetch_subkeys = current_version_fetch_subkeys,
+};
diff --git a/source3/registry/reg_dynamic.c b/source3/registry/reg_dynamic.c
index c342cd07e4..ca87cc60f5 100644
--- a/source3/registry/reg_dynamic.c
+++ b/source3/registry/reg_dynamic.c
@@ -73,29 +73,6 @@ static int perflib_009_params( REGVAL_CTR *regvals )
 }
 
 /***********************************************************************
-***********************************************************************/
-
-static int current_version( REGVAL_CTR *values )
-{
-	const char *sysroot_string = "c:\\Windows";
-	fstring sysversion;
-	fstring value;
-	uint32 value_length;
-	
-	value_length = push_ucs2( value, value, sysroot_string, sizeof(value), 
-		STR_TERMINATE|STR_NOALIGN );
-	regval_ctr_addvalue( values, "SystemRoot", REG_SZ, value, value_length );
-	
-	fstr_sprintf( sysversion, "%d.%d", lp_major_announce_version(), lp_minor_announce_version() );
-	value_length = push_ucs2( value, value, sysversion, sizeof(value), 
-		STR_TERMINATE|STR_NOALIGN );
-	regval_ctr_addvalue( values, "CurrentVersion", REG_SZ, value, value_length );
-	
-		
-	return regval_ctr_numvals( values );
-}
-
-/***********************************************************************
  Structure holding the registry paths and pointers to the value 
  enumeration functions
 ***********************************************************************/
@@ -103,7 +80,6 @@ static int current_version( REGVAL_CTR *values )
 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 }, 
 	{ NULL, NULL }
 };
 
diff --git a/source3/registry/reg_frontend.c b/source3/registry/reg_frontend.c
index 9539c2ba2f..d489050904 100644
--- a/source3/registry/reg_frontend.c
+++ b/source3/registry/reg_frontend.c
@@ -32,6 +32,7 @@ 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 regdb_ops;		/* these are the default */
 
 /* array of REGISTRY_HOOK's which are read into a tree for easy access */
@@ -48,6 +49,7 @@ REGISTRY_HOOK reg_hooks[] = {
   { KEY_PROD_OPTIONS,		&prod_options_reg_ops },
   { KEY_TCPIP_PARAMS,		&tcpip_params_reg_ops },
   { KEY_HKPT,			&hkpt_params_reg_ops },
+  { KEY_CURRENT_VERSION,	&current_version_reg_ops },
 #endif
   { NULL, NULL }
 };