Revert upstream branch to 3.5.8....oops

git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@3810 fc4039ab-9d04-0410-8cac-899223bdd6b0

50 files changed, 2197 insertions, 7205 deletions

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 935d2441af..b02481e07b 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -2,7 +2,7 @@
  *  Unix SMB/CIFS implementation.
  *  Virtual Windows Registry Layer
  *  Copyright (C) Volker Lendecke 2006
- *  Copyright (C) Michael Adam 2007-2010
+ *  Copyright (C) Michael Adam 2007-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
@@ -53,23 +53,17 @@
  * 0x1a		winreg_GetVersion			reg_getversion
  * 0x1b		winreg_OpenHKCC
  * 0x1c		winreg_OpenHKDD
- * 0x1d		winreg_QueryMultipleValues		reg_querymultiplevalues
+ * 0x1d		winreg_QueryMultipleValues
  * 0x1e		winreg_InitiateSystemShutdownEx
  * 0x1f		winreg_SaveKeyEx
  * 0x20		winreg_OpenHKPT
  * 0x21		winreg_OpenHKPN
- * 0x22		winreg_QueryMultipleValues2		reg_querymultiplevalues
+ * 0x22		winreg_QueryMultipleValues2
  *
  */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_api.h"
-#include "reg_cachehook.h"
-#include "reg_backend_db.h"
-#include "reg_dispatcher.h"
-#include "reg_objects.h"
-#include "../librpc/gen_ndr/ndr_security.h"
+#include "regfio.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
@@ -81,17 +75,15 @@
 
 static WERROR fill_value_cache(struct registry_key *key)
 {
-	WERROR werr;
-
 	if (key->values != NULL) {
 		if (!reg_values_need_update(key->key, key->values)) {
 			return WERR_OK;
 		}
 	}
 
-	werr = regval_ctr_init(key, &(key->values));
-	W_ERROR_NOT_OK_RETURN(werr);
-
+	if (!(key->values = TALLOC_ZERO_P(key, struct regval_ctr))) {
+		return WERR_NOMEM;
+	}
 	if (fetch_reg_values(key->key, key->values) == -1) {
 		TALLOC_FREE(key->values);
 		return WERR_BADFILE;
@@ -129,7 +121,7 @@ static int regkey_destructor(struct registry_key_handle *key)
 static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx, 
 				   struct registry_key *parent,
 				   const char *name,
-				   const struct security_token *token,
+				   const struct nt_user_token *token,
 				   uint32 access_desired,
 				   struct registry_key **pregkey)
 {
@@ -156,9 +148,9 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
 
 	key = regkey->key;
 	talloc_set_destructor(key, regkey_destructor);
-
+		
 	/* initialization */
-
+	
 	key->type = REG_KEY_GENERIC;
 
 	if (name[0] == '\0') {
@@ -190,7 +182,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
 
 	if( StrnCaseCmp(key->name, KEY_HKPD, strlen(KEY_HKPD)) == 0 )
 		key->type = REG_KEY_HKPD;
-
+	
 	/* Look up the table of registry I/O operations */
 
 	if ( !(key->ops = reghook_cache_find( key->name )) ) {
@@ -223,7 +215,7 @@ static WERROR regkey_open_onelevel(TALLOC_CTX *mem_ctx,
 
 	*pregkey = regkey;
 	result = WERR_OK;
-
+	
 done:
 	if ( !W_ERROR_IS_OK(result) ) {
 		TALLOC_FREE(regkey);
@@ -234,7 +226,7 @@ done:
 
 WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive,
 		    uint32 desired_access,
-		    const struct security_token *token,
+		    const struct nt_user_token *token,
 		    struct registry_key **pkey)
 {
 	SMB_ASSERT(hive != NULL);
@@ -339,7 +331,6 @@ WERROR reg_enumvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
 		     uint32 idx, char **pname, struct registry_value **pval)
 {
 	struct registry_value *val;
-	struct regval_blob *blob;
 	WERROR err;
 
 	if (!(key->key->access_granted & KEY_QUERY_VALUE)) {
@@ -350,24 +341,23 @@ WERROR reg_enumvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
 		return err;
 	}
 
-	if (idx >= regval_ctr_numvals(key->values)) {
+	if (idx >= key->values->num_values) {
 		return WERR_NO_MORE_ITEMS;
 	}
 
-	blob = regval_ctr_specific_value(key->values, idx);
-
-	val = talloc_zero(mem_ctx, struct registry_value);
-	if (val == NULL) {
-		return WERR_NOMEM;
+	err = registry_pull_value(mem_ctx, &val,
+				  key->values->values[idx]->type,
+				  key->values->values[idx]->data_p,
+				  key->values->values[idx]->size,
+				  key->values->values[idx]->size);
+	if (!W_ERROR_IS_OK(err)) {
+		return err;
 	}
 
-	val->type = regval_type(blob);
-	val->data = data_blob_talloc(mem_ctx, regval_data_p(blob), regval_size(blob));
-
 	if (pname
 	    && !(*pname = talloc_strdup(
-			 mem_ctx, regval_name(blob)))) {
-		TALLOC_FREE(val);
+			 mem_ctx, key->values->values[idx]->valuename))) {
+		SAFE_FREE(val);
 		return WERR_NOMEM;
 	}
 
@@ -389,10 +379,8 @@ WERROR reg_queryvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
 		return err;
 	}
 
-	for (i=0; i < regval_ctr_numvals(key->values); i++) {
-		struct regval_blob *blob;
-		blob = regval_ctr_specific_value(key->values, i);
-		if (strequal(regval_name(blob), name)) {
+	for (i=0; i<key->values->num_values; i++) {
+		if (strequal(key->values->values[i]->valuename, name)) {
 			return reg_enumvalue(mem_ctx, key, i, NULL, pval);
 		}
 	}
@@ -400,56 +388,6 @@ WERROR reg_queryvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
 	return WERR_BADFILE;
 }
 
-WERROR reg_querymultiplevalues(TALLOC_CTX *mem_ctx,
-			       struct registry_key *key,
-			       uint32_t num_names,
-			       const char **names,
-			       uint32_t *pnum_vals,
-			       struct registry_value **pvals)
-{
-	WERROR err;
-	uint32_t i, n, found = 0;
-	struct registry_value *vals;
-
-	if (num_names == 0) {
-		return WERR_OK;
-	}
-
-	if (!(key->key->access_granted & KEY_QUERY_VALUE)) {
-		return WERR_ACCESS_DENIED;
-	}
-
-	if (!(W_ERROR_IS_OK(err = fill_value_cache(key)))) {
-		return err;
-	}
-
-	vals = talloc_zero_array(mem_ctx, struct registry_value, num_names);
-	if (vals == NULL) {
-		return WERR_NOMEM;
-	}
-
-	for (n=0; n < num_names; n++) {
-		for (i=0; i < regval_ctr_numvals(key->values); i++) {
-			struct regval_blob *blob;
-			blob = regval_ctr_specific_value(key->values, i);
-			if (strequal(regval_name(blob), names[n])) {
-				struct registry_value *v;
-				err = reg_enumvalue(mem_ctx, key, i, NULL, &v);
-				if (!W_ERROR_IS_OK(err)) {
-					return err;
-				}
-				vals[n] = *v;
-				found++;
-			}
-		}
-	}
-
-	*pvals = vals;
-	*pnum_vals = found;
-
-	return WERR_OK;
-}
-
 WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys,
 			uint32_t *max_subkeylen, uint32_t *max_subkeysize, 
 			uint32_t *num_values, uint32_t *max_valnamelen, 
@@ -483,14 +421,13 @@ WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys,
 
 	max_len = 0;
 	max_size = 0;
-	for (i=0; i < regval_ctr_numvals(key->values); i++) {
-		struct regval_blob *blob;
-		blob = regval_ctr_specific_value(key->values, i);
-		max_len = MAX(max_len, strlen(regval_name(blob)));
-		max_size = MAX(max_size, regval_size(blob));
+	for (i=0; i<key->values->num_values; i++) {
+		max_len = MAX(max_len,
+			      strlen(key->values->values[i]->valuename));
+		max_size = MAX(max_size, key->values->values[i]->size);
 	}
 
-	*num_values = regval_ctr_numvals(key->values);
+	*num_values = key->values->num_values;
 	*max_valnamelen = max_len;
 	*max_valbufsize = max_size;
 
@@ -504,7 +441,7 @@ WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys,
 		return err;
 	}
 
-	*secdescsize = ndr_size_security_descriptor(secdesc, 0);
+	*secdescsize = ndr_size_security_descriptor(secdesc, NULL, 0);
 	TALLOC_FREE(mem_ctx);
 
 	*last_changed_time = 0;
@@ -523,6 +460,16 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
 	char *path, *end;
 	WERROR err;
 
+	/*
+	 * We must refuse to handle subkey-paths containing
+	 * a '/' character because at a lower level, after
+	 * normalization, '/' is treated as a key separator
+	 * just like '\\'.
+	 */
+	if (strchr(subkeypath, '/') != NULL) {
+		return WERR_INVALID_PARAM;
+	}
+
 	if (!(mem_ctx = talloc_new(ctx))) return WERR_NOMEM;
 
 	if (!(path = talloc_strdup(mem_ctx, subkeypath))) {
@@ -658,8 +605,8 @@ done:
 WERROR reg_setvalue(struct registry_key *key, const char *name,
 		    const struct registry_value *val)
 {
-	struct regval_blob *existing;
 	WERROR err;
+	DATA_BLOB value_data;
 	int res;
 
 	if (!(key->key->access_granted & KEY_SET_VALUE)) {
@@ -670,17 +617,14 @@ WERROR reg_setvalue(struct registry_key *key, const char *name,
 		return err;
 	}
 
-	existing = regval_ctr_getvalue(key->values, name);
-
-	if ((existing != NULL) &&
-	    (regval_size(existing) == val->data.length) &&
-	    (memcmp(regval_data_p(existing), val->data.data,
-		    val->data.length) == 0)) {
-		return WERR_OK;
+	err = registry_push_value(key, val, &value_data);
+	if (!W_ERROR_IS_OK(err)) {
+		return err;
 	}
 
 	res = regval_ctr_addvalue(key->values, name, val->type,
-				  val->data.data, val->data.length);
+				  (char *)value_data.data, value_data.length);
+	TALLOC_FREE(value_data.data);
 
 	if (res == 0) {
 		TALLOC_FREE(key->values);
@@ -697,15 +641,15 @@ WERROR reg_setvalue(struct registry_key *key, const char *name,
 
 static WERROR reg_value_exists(struct registry_key *key, const char *name)
 {
-	struct regval_blob *blob;
-
-	blob = regval_ctr_getvalue(key->values, name);
+	int i;
 
-	if (blob == NULL) {
-		return WERR_BADFILE;
-	} else {
-		return WERR_OK;
+	for (i=0; i<key->values->num_values; i++) {
+		if (strequal(key->values->values[i]->valuename, name)) {
+			return WERR_OK;
+		}
 	}
+
+	return WERR_BADFILE;
 }
 
 WERROR reg_deletevalue(struct registry_key *key, const char *name)
@@ -757,6 +701,281 @@ WERROR reg_getversion(uint32_t *version)
 	return WERR_OK;
 }
 
+/*******************************************************************
+ Note: topkeypat is the *full* path that this *key will be
+ loaded into (including the name of the key)
+ ********************************************************************/
+
+static WERROR reg_load_tree(REGF_FILE *regfile, const char *topkeypath,
+			    REGF_NK_REC *key)
+{
+	REGF_NK_REC *subkey;
+	struct registry_key_handle registry_key;
+	struct regval_ctr *values;
+	struct regsubkey_ctr *subkeys;
+	int i;
+	char *path = NULL;
+	WERROR result = WERR_OK;
+
+	/* initialize the struct registry_key_handle structure */
+
+	registry_key.ops = reghook_cache_find(topkeypath);
+	if (!registry_key.ops) {
+		DEBUG(0, ("reg_load_tree: Failed to assign registry_ops "
+			  "to [%s]\n", topkeypath));
+		return WERR_BADFILE;
+	}
+
+	registry_key.name = talloc_strdup(regfile->mem_ctx, topkeypath);
+	if (!registry_key.name) {
+		DEBUG(0, ("reg_load_tree: Talloc failed for reg_key.name!\n"));
+		return WERR_NOMEM;
+	}
+
+	/* now start parsing the values and subkeys */
+
+	result = regsubkey_ctr_init(regfile->mem_ctx, &subkeys);
+	W_ERROR_NOT_OK_RETURN(result);
+
+	values = TALLOC_ZERO_P(subkeys, struct regval_ctr);
+	if (values == NULL) {
+		return WERR_NOMEM;
+	}
+
+	/* copy values into the struct regval_ctr */
+
+	for (i=0; i<key->num_values; i++) {
+		regval_ctr_addvalue(values, key->values[i].valuename,
+				    key->values[i].type,
+				    (char*)key->values[i].data,
+				    (key->values[i].data_size & ~VK_DATA_IN_OFFSET));
+	}
+
+	/* copy subkeys into the struct regsubkey_ctr */
+
+	key->subkey_index = 0;
+	while ((subkey = regfio_fetch_subkey( regfile, key ))) {
+		result = regsubkey_ctr_addkey(subkeys, subkey->keyname);
+		if (!W_ERROR_IS_OK(result)) {
+			TALLOC_FREE(subkeys);
+			return result;
+		}
+	}
+
+	/* write this key and values out */
+
+	if (!store_reg_values(&registry_key, values)
+	    || !store_reg_keys(&registry_key, subkeys))
+	{
+		DEBUG(0,("reg_load_tree: Failed to load %s!\n", topkeypath));
+		result = WERR_REG_IO_FAILURE;
+	}
+
+	TALLOC_FREE(subkeys);
+
+	if (!W_ERROR_IS_OK(result)) {
+		return result;
+	}
+
+	/* now continue to load each subkey registry tree */
+
+	key->subkey_index = 0;
+	while ((subkey = regfio_fetch_subkey(regfile, key))) {
+		path = talloc_asprintf(regfile->mem_ctx,
+				       "%s\\%s",
+				       topkeypath,
+				       subkey->keyname);
+		if (path == NULL) {
+			return WERR_NOMEM;
+		}
+		result = reg_load_tree(regfile, path, subkey);
+		if (!W_ERROR_IS_OK(result)) {
+			break;
+		}
+	}
+
+	return result;
+}
+
+/*******************************************************************
+ ********************************************************************/
+
+static WERROR restore_registry_key(struct registry_key_handle *krecord,
+				   const char *fname)
+{
+	REGF_FILE *regfile;
+	REGF_NK_REC *rootkey;
+	WERROR result;
+
+	/* open the registry file....fail if the file already exists */
+
+	regfile = regfio_open(fname, (O_RDONLY), 0);
+	if (regfile == NULL) {
+		DEBUG(0, ("restore_registry_key: failed to open \"%s\" (%s)\n",
+			  fname, strerror(errno)));
+		return ntstatus_to_werror(map_nt_error_from_unix(errno));
+	}
+
+	/* get the rootkey from the regf file and then load the tree
+	   via recursive calls */
+
+	if (!(rootkey = regfio_rootkey(regfile))) {
+		regfio_close(regfile);
+		return WERR_REG_FILE_INVALID;
+	}
+
+	result = reg_load_tree(regfile, krecord->name, rootkey);
+
+	/* cleanup */
+
+	regfio_close(regfile);
+
+	return result;
+}
+
+WERROR reg_restorekey(struct registry_key *key, const char *fname)
+{
+	return restore_registry_key(key->key, fname);
+}
+
+/********************************************************************
+********************************************************************/
+
+static WERROR reg_write_tree(REGF_FILE *regfile, const char *keypath,
+			     REGF_NK_REC *parent)
+{
+	REGF_NK_REC *key;
+	struct regval_ctr *values;
+	struct regsubkey_ctr *subkeys;
+	int i, num_subkeys;
+	char *key_tmp = NULL;
+	char *keyname, *parentpath;
+	char *subkeypath = NULL;
+	char *subkeyname;
+	struct registry_key_handle registry_key;
+	WERROR result = WERR_OK;
+	SEC_DESC *sec_desc = NULL;
+
+	if (!regfile) {
+		return WERR_GENERAL_FAILURE;
+	}
+
+	if (!keypath) {
+		return WERR_OBJECT_PATH_INVALID;
+	}
+
+	/* split up the registry key path */
+
+	key_tmp = talloc_strdup(regfile->mem_ctx, keypath);
+	if (!key_tmp) {
+		return WERR_NOMEM;
+	}
+	if (!reg_split_key(key_tmp, &parentpath, &keyname)) {
+		return WERR_OBJECT_PATH_INVALID;
+	}
+
+	if (!keyname) {
+		keyname = parentpath;
+	}
+
+	/* we need a registry_key_handle object here to enumerate subkeys and values */
+
+	ZERO_STRUCT(registry_key);
+
+	registry_key.name = talloc_strdup(regfile->mem_ctx, keypath);
+	if (registry_key.name == NULL) {
+		return WERR_NOMEM;
+	}
+
+	registry_key.ops = reghook_cache_find(registry_key.name);
+	if (registry_key.ops == NULL) {
+		return WERR_BADFILE;
+	}
+
+	/* lookup the values and subkeys */
+
+	result = regsubkey_ctr_init(regfile->mem_ctx, &subkeys);
+	W_ERROR_NOT_OK_RETURN(result);
+
+	values = TALLOC_ZERO_P(subkeys, struct regval_ctr);
+	if (values == NULL) {
+		return WERR_NOMEM;
+	}
+
+	fetch_reg_keys(&registry_key, subkeys);
+	fetch_reg_values(&registry_key, values);
+
+	result = regkey_get_secdesc(regfile->mem_ctx, &registry_key, &sec_desc);
+	if (!W_ERROR_IS_OK(result)) {
+		goto done;
+	}
+
+	/* write out this key */
+
+	key = regfio_write_key(regfile, keyname, values, subkeys, sec_desc,
+			       parent);
+	if (key == NULL) {
+		result = WERR_CAN_NOT_COMPLETE;
+		goto done;
+	}
+
+	/* write each one of the subkeys out */
+
+	num_subkeys = regsubkey_ctr_numkeys(subkeys);
+	for (i=0; i<num_subkeys; i++) {
+		subkeyname = regsubkey_ctr_specific_key(subkeys, i);
+		subkeypath = talloc_asprintf(regfile->mem_ctx, "%s\\%s",
+					     keypath, subkeyname);
+		if (subkeypath == NULL) {
+			result = WERR_NOMEM;
+			goto done;
+		}
+		result = reg_write_tree(regfile, subkeypath, key);
+		if (!W_ERROR_IS_OK(result))
+			goto done;
+	}
+
+	DEBUG(6, ("reg_write_tree: wrote key [%s]\n", keypath));
+
+done:
+	TALLOC_FREE(subkeys);
+	TALLOC_FREE(registry_key.name);
+
+	return result;
+}
+
+static WERROR backup_registry_key(struct registry_key_handle *krecord,
+				  const char *fname)
+{
+	REGF_FILE *regfile;
+	WERROR result;
+
+	/* open the registry file....fail if the file already exists */
+
+	regfile = regfio_open(fname, (O_RDWR|O_CREAT|O_EXCL),
+			      (S_IRUSR|S_IWUSR));
+	if (regfile == NULL) {
+		DEBUG(0,("backup_registry_key: failed to open \"%s\" (%s)\n",
+			 fname, strerror(errno) ));
+		return ntstatus_to_werror(map_nt_error_from_unix(errno));
+	}
+
+	/* write the registry tree to the file  */
+
+	result = reg_write_tree(regfile, krecord->name, NULL);
+
+	/* cleanup */
+
+	regfio_close(regfile);
+
+	return result;
+}
+
+WERROR reg_savekey(struct registry_key *key, const char *fname)
+{
+	return backup_registry_key(key->key, fname);
+}
+
 /**********************************************************************
  * Higher level utility functions
  **********************************************************************/
@@ -774,10 +993,8 @@ WERROR reg_deleteallvalues(struct registry_key *key)
 		return err;
 	}
 
-	for (i=0; i < regval_ctr_numvals(key->values); i++) {
-		struct regval_blob *blob;
-		blob = regval_ctr_specific_value(key->values, i);
-		regval_ctr_delvalue(key->values, regval_name(blob));
+	for (i=0; i<key->values->num_values; i++) {
+		regval_ctr_delvalue(key->values, key->values->values[i]->valuename);
 	}
 
 	if (!store_reg_values(key->key, key->values)) {
@@ -789,19 +1006,82 @@ WERROR reg_deleteallvalues(struct registry_key *key)
 }
 
 /*
+ * Utility function to open a complete registry path including the hive prefix.
+ */
+
+WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char *orig_path,
+		     uint32 desired_access, const struct nt_user_token *token,
+		     struct registry_key **pkey)
+{
+	struct registry_key *hive, *key;
+	char *path, *p;
+	WERROR err;
+
+	if (!(path = SMB_STRDUP(orig_path))) {
+		return WERR_NOMEM;
+	}
+
+	p = strchr(path, '\\');
+
+	if ((p == NULL) || (p[1] == '\0')) {
+		/*
+		 * No key behind the hive, just return the hive
+		 */
+
+		err = reg_openhive(mem_ctx, path, desired_access, token,
+				   &hive);
+		if (!W_ERROR_IS_OK(err)) {
+			SAFE_FREE(path);
+			return err;
+		}
+		SAFE_FREE(path);
+		*pkey = hive;
+		return WERR_OK;
+	}
+
+	*p = '\0';
+
+	err = reg_openhive(mem_ctx, path, KEY_ENUMERATE_SUB_KEYS, token,
+			   &hive);
+	if (!W_ERROR_IS_OK(err)) {
+		SAFE_FREE(path);
+		return err;
+	}
+
+	err = reg_openkey(mem_ctx, hive, p+1, desired_access, &key);
+
+	TALLOC_FREE(hive);
+	SAFE_FREE(path);
+
+	if (!W_ERROR_IS_OK(err)) {
+		return err;
+	}
+
+	*pkey = key;
+	return WERR_OK;
+}
+
+/*
  * Utility function to delete a registry key with all its subkeys.
  * Note that reg_deletekey returns ACCESS_DENIED when called on a
  * key that has subkeys.
  */
-static WERROR reg_deletekey_recursive_internal(struct registry_key *parent,
+static WERROR reg_deletekey_recursive_internal(TALLOC_CTX *ctx,
+					       struct registry_key *parent,
 					       const char *path,
 					       bool del_key)
 {
+	TALLOC_CTX *mem_ctx = NULL;
 	WERROR werr = WERR_OK;
 	struct registry_key *key;
 	char *subkey_name = NULL;
 	uint32 i;
-	TALLOC_CTX *mem_ctx = talloc_stackframe();
+
+	mem_ctx = talloc_new(ctx);
+	if (mem_ctx == NULL) {
+		werr = WERR_NOMEM;
+		goto done;
+	}
 
 	/* recurse through subkeys first */
 	werr = reg_openkey(mem_ctx, parent, path, REG_KEY_ALL, &key);
@@ -818,7 +1098,9 @@ static WERROR reg_deletekey_recursive_internal(struct registry_key *parent,
 	 */
 	for (i = regsubkey_ctr_numkeys(key->subkeys) ; i > 0; i--) {
 		subkey_name = regsubkey_ctr_specific_key(key->subkeys, i-1);
-		werr = reg_deletekey_recursive_internal(key, subkey_name, true);
+		werr = reg_deletekey_recursive_internal(mem_ctx, key,
+					subkey_name,
+					true);
 		W_ERROR_NOT_OK_GOTO_DONE(werr);
 	}
 
@@ -832,7 +1114,8 @@ done:
 	return werr;
 }
 
-static WERROR reg_deletekey_recursive_trans(struct registry_key *parent,
+static WERROR reg_deletekey_recursive_trans(TALLOC_CTX *ctx,
+					    struct registry_key *parent,
 					    const char *path,
 					    bool del_key)
 {
@@ -846,24 +1129,17 @@ static WERROR reg_deletekey_recursive_trans(struct registry_key *parent,
 		return werr;
 	}
 
-	werr = reg_deletekey_recursive_internal(parent, path, del_key);
+	werr = reg_deletekey_recursive_internal(ctx, parent, path, del_key);
 
 	if (!W_ERROR_IS_OK(werr)) {
-		WERROR werr2;
-
 		DEBUG(1, (__location__ " failed to delete key '%s' from key "
 			  "'%s': %s\n", path, parent->key->name,
 			  win_errstr(werr)));
-
-		werr2 = regdb_transaction_cancel();
-		if (!W_ERROR_IS_OK(werr2)) {
+		werr = regdb_transaction_cancel();
+		if (!W_ERROR_IS_OK(werr)) {
 			DEBUG(0, ("reg_deletekey_recursive_trans: "
 				  "error cancelling transaction: %s\n",
-				  win_errstr(werr2)));
-			/*
-			 * return the original werr or the
-			 * error from cancelling the transaction?
-			 */
+				  win_errstr(werr)));
 		}
 	} else {
 		werr = regdb_transaction_commit();
@@ -877,15 +1153,115 @@ static WERROR reg_deletekey_recursive_trans(struct registry_key *parent,
 	return werr;
 }
 
-WERROR reg_deletekey_recursive(struct registry_key *parent,
+WERROR reg_deletekey_recursive(TALLOC_CTX *ctx,
+			       struct registry_key *parent,
 			       const char *path)
 {
-	return reg_deletekey_recursive_trans(parent, path, true);
+	return reg_deletekey_recursive_trans(ctx, parent, path, true);
 }
 
-WERROR reg_deletesubkeys_recursive(struct registry_key *parent,
+WERROR reg_deletesubkeys_recursive(TALLOC_CTX *ctx,
+				   struct registry_key *parent,
 				   const char *path)
 {
-	return reg_deletekey_recursive_trans(parent, path, false);
+	return reg_deletekey_recursive_trans(ctx, parent, path, false);
+}
+
+#if 0
+/* these two functions are unused. */
+
+/**
+ * Utility function to create a registry key without opening the hive
+ * before. Assumes the hive already exists.
+ */
+
+WERROR reg_create_path(TALLOC_CTX *mem_ctx, const char *orig_path,
+		       uint32 desired_access,
+		       const struct nt_user_token *token,
+		       enum winreg_CreateAction *paction,
+		       struct registry_key **pkey)
+{
+	struct registry_key *hive;
+	char *path, *p;
+	WERROR err;
+
+	if (!(path = SMB_STRDUP(orig_path))) {
+		return WERR_NOMEM;
+	}
+
+	p = strchr(path, '\\');
+
+	if ((p == NULL) || (p[1] == '\0')) {
+		/*
+		 * No key behind the hive, just return the hive
+		 */
+
+		err = reg_openhive(mem_ctx, path, desired_access, token,
+				   &hive);
+		if (!W_ERROR_IS_OK(err)) {
+			SAFE_FREE(path);
+			return err;
+		}
+		SAFE_FREE(path);
+		*pkey = hive;
+		*paction = REG_OPENED_EXISTING_KEY;
+		return WERR_OK;
+	}
+
+	*p = '\0';
+
+	err = reg_openhive(mem_ctx, path,
+			   (strchr(p+1, '\\') != NULL) ?
+			   KEY_ENUMERATE_SUB_KEYS : KEY_CREATE_SUB_KEY,
+			   token, &hive);
+	if (!W_ERROR_IS_OK(err)) {
+		SAFE_FREE(path);
+		return err;
+	}
+
+	err = reg_createkey(mem_ctx, hive, p+1, desired_access, pkey, paction);
+	SAFE_FREE(path);
+	TALLOC_FREE(hive);
+	return err;
 }
 
+/*
+ * Utility function to create a registry key without opening the hive
+ * before. Will not delete a hive.
+ */
+
+WERROR reg_delete_path(const struct nt_user_token *token,
+		       const char *orig_path)
+{
+	struct registry_key *hive;
+	char *path, *p;
+	WERROR err;
+
+	if (!(path = SMB_STRDUP(orig_path))) {
+		return WERR_NOMEM;
+	}
+
+	p = strchr(path, '\\');
+
+	if ((p == NULL) || (p[1] == '\0')) {
+		SAFE_FREE(path);
+		return WERR_INVALID_PARAM;
+	}
+
+	*p = '\0';
+
+	err = reg_openhive(NULL, path,
+			   (strchr(p+1, '\\') != NULL) ?
+			   KEY_ENUMERATE_SUB_KEYS : KEY_CREATE_SUB_KEY,
+			   token, &hive);
+	if (!W_ERROR_IS_OK(err)) {
+		SAFE_FREE(path);
+		return err;
+	}
+
+	err = reg_deletekey(hive, p+1);
+	SAFE_FREE(path);
+	TALLOC_FREE(hive);
+	return err;
+}
+#endif /* #if 0 */
diff --git a/source3/registry/reg_api.h b/source3/registry/reg_api.h
deleted file mode 100644
index 41c4792e59..0000000000
--- a/source3/registry/reg_api.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *
- *  Virtual Windows Registry Layer
- *
- *  Copyright (C) Volker Lendecke 2006
- *  Copyright (C) Michael Adam 2007-2010
- *
- *  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/>.
- */
-
-#ifndef _REG_API_H
-#define _REG_API_H
-
-WERROR reg_openhive(TALLOC_CTX *mem_ctx, const char *hive,
-		    uint32 desired_access,
-		    const struct security_token *token,
-		    struct registry_key **pkey);
-WERROR reg_openkey(TALLOC_CTX *mem_ctx, struct registry_key *parent,
-		   const char *name, uint32 desired_access,
-		   struct registry_key **pkey);
-WERROR reg_enumkey(TALLOC_CTX *mem_ctx, struct registry_key *key,
-		   uint32 idx, char **name, NTTIME *last_write_time);
-WERROR reg_enumvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
-		     uint32 idx, char **pname, struct registry_value **pval);
-WERROR reg_queryvalue(TALLOC_CTX *mem_ctx, struct registry_key *key,
-		      const char *name, struct registry_value **pval);
-WERROR reg_querymultiplevalues(TALLOC_CTX *mem_ctx,
-			       struct registry_key *key,
-			       uint32_t num_names,
-			       const char **names,
-			       uint32_t *pnum_vals,
-			       struct registry_value **pvals);
-WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys,
-			uint32_t *max_subkeylen, uint32_t *max_subkeysize,
-			uint32_t *num_values, uint32_t *max_valnamelen,
-			uint32_t *max_valbufsize, uint32_t *secdescsize,
-			NTTIME *last_changed_time);
-WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
-		     const char *subkeypath, uint32 desired_access,
-		     struct registry_key **pkey,
-		     enum winreg_CreateAction *paction);
-WERROR reg_deletekey(struct registry_key *parent, const char *path);
-WERROR reg_setvalue(struct registry_key *key, const char *name,
-		    const struct registry_value *val);
-WERROR reg_deletevalue(struct registry_key *key, const char *name);
-WERROR reg_getkeysecurity(TALLOC_CTX *mem_ctx, struct registry_key *key,
-			  struct security_descriptor **psecdesc);
-WERROR reg_setkeysecurity(struct registry_key *key,
-			  struct security_descriptor *psecdesc);
-WERROR reg_getversion(uint32_t *version);
-WERROR reg_deleteallvalues(struct registry_key *key);
-WERROR reg_deletekey_recursive(struct registry_key *parent,
-			       const char *path);
-WERROR reg_deletesubkeys_recursive(struct registry_key *parent,
-				   const char *path);
-
-
-#endif /* _REG_API_H */
diff --git a/source3/registry/reg_api_regf.c b/source3/registry/reg_api_regf.c
deleted file mode 100644
index 97eab03a70..0000000000
--- a/source3/registry/reg_api_regf.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *  Virtual Windows Registry Layer
- *  Copyright (C) Volker Lendecke 2006
- *  Copyright (C) Michael Adam 2007-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/>.
- */
-
-#include "includes.h"
-#include "system/filesys.h"
-#include "registry.h"
-#include "reg_api_regf.h"
-#include "reg_cachehook.h"
-#include "regfio.h"
-#include "reg_util_internal.h"
-#include "reg_dispatcher.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_REGISTRY
-
-/*******************************************************************
- Note: topkeypat is the *full* path that this *key will be
- loaded into (including the name of the key)
- ********************************************************************/
-
-static WERROR reg_load_tree(REGF_FILE *regfile, const char *topkeypath,
-			    REGF_NK_REC *key)
-{
-	REGF_NK_REC *subkey;
-	struct registry_key_handle registry_key;
-	struct regval_ctr *values;
-	struct regsubkey_ctr *subkeys;
-	int i;
-	char *path = NULL;
-	WERROR result = WERR_OK;
-
-	/* initialize the struct registry_key_handle structure */
-
-	registry_key.ops = reghook_cache_find(topkeypath);
-	if (!registry_key.ops) {
-		DEBUG(0, ("reg_load_tree: Failed to assign registry_ops "
-			  "to [%s]\n", topkeypath));
-		return WERR_BADFILE;
-	}
-
-	registry_key.name = talloc_strdup(regfile->mem_ctx, topkeypath);
-	if (!registry_key.name) {
-		DEBUG(0, ("reg_load_tree: Talloc failed for reg_key.name!\n"));
-		return WERR_NOMEM;
-	}
-
-	/* now start parsing the values and subkeys */
-
-	result = regsubkey_ctr_init(regfile->mem_ctx, &subkeys);
-	W_ERROR_NOT_OK_RETURN(result);
-
-	result = regval_ctr_init(subkeys, &values);
-	W_ERROR_NOT_OK_RETURN(result);
-
-	/* copy values into the struct regval_ctr */
-
-	for (i=0; i<key->num_values; i++) {
-		regval_ctr_addvalue(values, key->values[i].valuename,
-				    key->values[i].type,
-				    key->values[i].data,
-				    (key->values[i].data_size & ~VK_DATA_IN_OFFSET));
-	}
-
-	/* copy subkeys into the struct regsubkey_ctr */
-
-	key->subkey_index = 0;
-	while ((subkey = regfio_fetch_subkey( regfile, key ))) {
-		result = regsubkey_ctr_addkey(subkeys, subkey->keyname);
-		if (!W_ERROR_IS_OK(result)) {
-			TALLOC_FREE(subkeys);
-			return result;
-		}
-	}
-
-	/* write this key and values out */
-
-	if (!store_reg_values(&registry_key, values)
-	    || !store_reg_keys(&registry_key, subkeys))
-	{
-		DEBUG(0,("reg_load_tree: Failed to load %s!\n", topkeypath));
-		result = WERR_REG_IO_FAILURE;
-	}
-
-	TALLOC_FREE(subkeys);
-
-	if (!W_ERROR_IS_OK(result)) {
-		return result;
-	}
-
-	/* now continue to load each subkey registry tree */
-
-	key->subkey_index = 0;
-	while ((subkey = regfio_fetch_subkey(regfile, key))) {
-		path = talloc_asprintf(regfile->mem_ctx,
-				       "%s\\%s",
-				       topkeypath,
-				       subkey->keyname);
-		if (path == NULL) {
-			return WERR_NOMEM;
-		}
-		result = reg_load_tree(regfile, path, subkey);
-		if (!W_ERROR_IS_OK(result)) {
-			break;
-		}
-	}
-
-	return result;
-}
-
-/*******************************************************************
- ********************************************************************/
-
-static WERROR restore_registry_key(struct registry_key_handle *krecord,
-				   const char *fname)
-{
-	REGF_FILE *regfile;
-	REGF_NK_REC *rootkey;
-	WERROR result;
-
-	/* open the registry file....fail if the file already exists */
-
-	regfile = regfio_open(fname, (O_RDONLY), 0);
-	if (regfile == NULL) {
-		DEBUG(0, ("restore_registry_key: failed to open \"%s\" (%s)\n",
-			  fname, strerror(errno)));
-		return ntstatus_to_werror(map_nt_error_from_unix(errno));
-	}
-
-	/* get the rootkey from the regf file and then load the tree
-	   via recursive calls */
-
-	if (!(rootkey = regfio_rootkey(regfile))) {
-		regfio_close(regfile);
-		return WERR_REG_FILE_INVALID;
-	}
-
-	result = reg_load_tree(regfile, krecord->name, rootkey);
-
-	/* cleanup */
-
-	regfio_close(regfile);
-
-	return result;
-}
-
-WERROR reg_restorekey(struct registry_key *key, const char *fname)
-{
-	return restore_registry_key(key->key, fname);
-}
-
-/********************************************************************
-********************************************************************/
-
-static WERROR reg_write_tree(REGF_FILE *regfile, const char *keypath,
-			     REGF_NK_REC *parent)
-{
-	REGF_NK_REC *key;
-	struct regval_ctr *values;
-	struct regsubkey_ctr *subkeys;
-	int i, num_subkeys;
-	char *key_tmp = NULL;
-	char *keyname, *parentpath;
-	char *subkeypath = NULL;
-	char *subkeyname;
-	struct registry_key_handle registry_key;
-	WERROR result = WERR_OK;
-	struct security_descriptor *sec_desc = NULL;
-
-	if (!regfile) {
-		return WERR_GENERAL_FAILURE;
-	}
-
-	if (!keypath) {
-		return WERR_OBJECT_PATH_INVALID;
-	}
-
-	/* split up the registry key path */
-
-	key_tmp = talloc_strdup(regfile->mem_ctx, keypath);
-	if (!key_tmp) {
-		return WERR_NOMEM;
-	}
-	if (!reg_split_key(key_tmp, &parentpath, &keyname)) {
-		return WERR_OBJECT_PATH_INVALID;
-	}
-
-	if (!keyname) {
-		keyname = parentpath;
-	}
-
-	/* we need a registry_key_handle object here to enumerate subkeys and values */
-
-	ZERO_STRUCT(registry_key);
-
-	registry_key.name = talloc_strdup(regfile->mem_ctx, keypath);
-	if (registry_key.name == NULL) {
-		return WERR_NOMEM;
-	}
-
-	registry_key.ops = reghook_cache_find(registry_key.name);
-	if (registry_key.ops == NULL) {
-		return WERR_BADFILE;
-	}
-
-	/* lookup the values and subkeys */
-
-	result = regsubkey_ctr_init(regfile->mem_ctx, &subkeys);
-	W_ERROR_NOT_OK_RETURN(result);
-
-	result = regval_ctr_init(subkeys, &values);
-	W_ERROR_NOT_OK_RETURN(result);
-
-	fetch_reg_keys(&registry_key, subkeys);
-	fetch_reg_values(&registry_key, values);
-
-	result = regkey_get_secdesc(regfile->mem_ctx, &registry_key, &sec_desc);
-	if (!W_ERROR_IS_OK(result)) {
-		goto done;
-	}
-
-	/* write out this key */
-
-	key = regfio_write_key(regfile, keyname, values, subkeys, sec_desc,
-			       parent);
-	if (key == NULL) {
-		result = WERR_CAN_NOT_COMPLETE;
-		goto done;
-	}
-
-	/* write each one of the subkeys out */
-
-	num_subkeys = regsubkey_ctr_numkeys(subkeys);
-	for (i=0; i<num_subkeys; i++) {
-		subkeyname = regsubkey_ctr_specific_key(subkeys, i);
-		subkeypath = talloc_asprintf(regfile->mem_ctx, "%s\\%s",
-					     keypath, subkeyname);
-		if (subkeypath == NULL) {
-			result = WERR_NOMEM;
-			goto done;
-		}
-		result = reg_write_tree(regfile, subkeypath, key);
-		if (!W_ERROR_IS_OK(result))
-			goto done;
-	}
-
-	DEBUG(6, ("reg_write_tree: wrote key [%s]\n", keypath));
-
-done:
-	TALLOC_FREE(subkeys);
-	TALLOC_FREE(registry_key.name);
-
-	return result;
-}
-
-static WERROR backup_registry_key(struct registry_key_handle *krecord,
-				  const char *fname)
-{
-	REGF_FILE *regfile;
-	WERROR result;
-
-	/* open the registry file....fail if the file already exists */
-
-	regfile = regfio_open(fname, (O_RDWR|O_CREAT|O_EXCL),
-			      (S_IRUSR|S_IWUSR));
-	if (regfile == NULL) {
-		DEBUG(0,("backup_registry_key: failed to open \"%s\" (%s)\n",
-			 fname, strerror(errno) ));
-		return ntstatus_to_werror(map_nt_error_from_unix(errno));
-	}
-
-	/* write the registry tree to the file  */
-
-	result = reg_write_tree(regfile, krecord->name, NULL);
-
-	/* cleanup */
-
-	regfio_close(regfile);
-
-	return result;
-}
-
-WERROR reg_savekey(struct registry_key *key, const char *fname)
-{
-	return backup_registry_key(key->key, fname);
-}
diff --git a/source3/registry/reg_api_regf.h b/source3/registry/reg_api_regf.h
deleted file mode 100644
index c68261fa95..0000000000
--- a/source3/registry/reg_api_regf.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *
- *  Virtual Windows Registry Layer
- *
- *  Copyright (C) Volker Lendecke 2006
- *  Copyright (C) Michael Adam 2007-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/>.
- */
-
-/*
- * Portion of reg_api that references regfio.c code.
- * These are the savekey and restorekey calls.
- * These calls are currently only used in the WINREG rpc server.
- */
-
-#ifndef _REG_API_REGF_H
-#define _REG_API_REGF_H
-
-WERROR reg_restorekey(struct registry_key *key, const char *fname);
-WERROR reg_savekey(struct registry_key *key, const char *fname);
-
-#endif /* _REG_API_REGF_H */
diff --git a/source3/registry/reg_api_util.c b/source3/registry/reg_api_util.c
deleted file mode 100644
index 045ad21517..0000000000
--- a/source3/registry/reg_api_util.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *  Virtual Windows Registry Layer
- *  Copyright (C) Volker Lendecke 2006
- *  Copyright (C) Michael Adam 2007-2010
- *
- *  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/>.
- */
-
-/*
- * Higher level utility functions on top of reg_api.c
- */
-
-#include "includes.h"
-#include "registry.h"
-#include "reg_api.h"
-#include "reg_api_util.h"
-
-/**
- * Utility function to open a complete registry path including the hive prefix.
- */
-WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char *orig_path,
-		     uint32 desired_access, const struct security_token *token,
-		     struct registry_key **pkey)
-{
-	struct registry_key *hive, *key;
-	char *path, *p;
-	WERROR err;
-
-	if (!(path = SMB_STRDUP(orig_path))) {
-		return WERR_NOMEM;
-	}
-
-	p = strchr(path, '\\');
-
-	if ((p == NULL) || (p[1] == '\0')) {
-		/*
-		 * No key behind the hive, just return the hive
-		 */
-
-		err = reg_openhive(mem_ctx, path, desired_access, token,
-				   &hive);
-		if (!W_ERROR_IS_OK(err)) {
-			SAFE_FREE(path);
-			return err;
-		}
-		SAFE_FREE(path);
-		*pkey = hive;
-		return WERR_OK;
-	}
-
-	*p = '\0';
-
-	err = reg_openhive(mem_ctx, path, KEY_ENUMERATE_SUB_KEYS, token,
-			   &hive);
-	if (!W_ERROR_IS_OK(err)) {
-		SAFE_FREE(path);
-		return err;
-	}
-
-	err = reg_openkey(mem_ctx, hive, p+1, desired_access, &key);
-
-	TALLOC_FREE(hive);
-	SAFE_FREE(path);
-
-	if (!W_ERROR_IS_OK(err)) {
-		return err;
-	}
-
-	*pkey = key;
-	return WERR_OK;
-}
-
-#if 0
-/* these two functions are unused. */
-
-/**
- * Utility function to create a registry key without opening the hive
- * before. Assumes the hive already exists.
- */
-
-WERROR reg_create_path(TALLOC_CTX *mem_ctx, const char *orig_path,
-		       uint32 desired_access,
-		       const struct security_token *token,
-		       enum winreg_CreateAction *paction,
-		       struct registry_key **pkey)
-{
-	struct registry_key *hive;
-	char *path, *p;
-	WERROR err;
-
-	if (!(path = SMB_STRDUP(orig_path))) {
-		return WERR_NOMEM;
-	}
-
-	p = strchr(path, '\\');
-
-	if ((p == NULL) || (p[1] == '\0')) {
-		/*
-		 * No key behind the hive, just return the hive
-		 */
-
-		err = reg_openhive(mem_ctx, path, desired_access, token,
-				   &hive);
-		if (!W_ERROR_IS_OK(err)) {
-			SAFE_FREE(path);
-			return err;
-		}
-		SAFE_FREE(path);
-		*pkey = hive;
-		*paction = REG_OPENED_EXISTING_KEY;
-		return WERR_OK;
-	}
-
-	*p = '\0';
-
-	err = reg_openhive(mem_ctx, path,
-			   (strchr(p+1, '\\') != NULL) ?
-			   KEY_ENUMERATE_SUB_KEYS : KEY_CREATE_SUB_KEY,
-			   token, &hive);
-	if (!W_ERROR_IS_OK(err)) {
-		SAFE_FREE(path);
-		return err;
-	}
-
-	err = reg_createkey(mem_ctx, hive, p+1, desired_access, pkey, paction);
-	SAFE_FREE(path);
-	TALLOC_FREE(hive);
-	return err;
-}
-
-/*
- * Utility function to create a registry key without opening the hive
- * before. Will not delete a hive.
- */
-
-WERROR reg_delete_path(const struct security_token *token,
-		       const char *orig_path)
-{
-	struct registry_key *hive;
-	char *path, *p;
-	WERROR err;
-
-	if (!(path = SMB_STRDUP(orig_path))) {
-		return WERR_NOMEM;
-	}
-
-	p = strchr(path, '\\');
-
-	if ((p == NULL) || (p[1] == '\0')) {
-		SAFE_FREE(path);
-		return WERR_INVALID_PARAM;
-	}
-
-	*p = '\0';
-
-	err = reg_openhive(NULL, path,
-			   (strchr(p+1, '\\') != NULL) ?
-			   KEY_ENUMERATE_SUB_KEYS : KEY_CREATE_SUB_KEY,
-			   token, &hive);
-	if (!W_ERROR_IS_OK(err)) {
-		SAFE_FREE(path);
-		return err;
-	}
-
-	err = reg_deletekey(hive, p+1);
-	SAFE_FREE(path);
-	TALLOC_FREE(hive);
-	return err;
-}
-#endif /* #if 0 */
diff --git a/source3/registry/reg_api_util.h b/source3/registry/reg_api_util.h
deleted file mode 100644
index d2d7894d78..0000000000
--- a/source3/registry/reg_api_util.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *  Virtual Windows Registry Layer
- *  Copyright (C) Volker Lendecke 2006
- *  Copyright (C) Michael Adam 2007-2010
- *
- *  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/>.
- */
-
-/*
- * Higher level utility functions on top of reg_api.c
- */
-
-#ifndef _REG_API_UTIL_H
-#define _REG_API_UTIL_H
-
-/**
- * Utility function to open a complete registry path including the hive prefix.
- */
-WERROR reg_open_path(TALLOC_CTX *mem_ctx, const char *orig_path,
-		     uint32 desired_access, const struct security_token *token,
-		     struct registry_key **pkey);
-
-#if 0
-/* currently unused */
-WERROR reg_create_path(TALLOC_CTX *mem_ctx, const char *orig_path,
-		       uint32 desired_access,
-		       const struct security_token *token,
-		       enum winreg_CreateAction *paction,
-		       struct registry_key **pkey);
-WERROR reg_delete_path(const struct security_token *token,
-		       const char *orig_path);
-#endif
-
-#endif /* _REG_API_UTIL_H */
diff --git a/source3/registry/reg_backend_current_version.c b/source3/registry/reg_backend_current_version.c
index ab7bd517b0..386c580965 100644
--- a/source3/registry/reg_backend_current_version.c
+++ b/source3/registry/reg_backend_current_version.c
@@ -25,16 +25,13 @@
  */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_util_internal.h"
-#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 extern struct registry_ops regdb_ops;
 
-#define KEY_CURRENT_VERSION_NORM "HKLM\\SOFTWARE\\MICROSOFT\\WINDOWS NT\\CURRENTVERSION"
+#define KEY_CURRENT_VERSION_NORM "HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION"
 
 static int current_version_fetch_values(const char *key, struct regval_ctr *values)
 {
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 11bbe7ed36..fe15b4e461 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -21,15 +21,6 @@
 /* Implementation of internal registry database functions. */
 
 #include "includes.h"
-#include "system/filesys.h"
-#include "registry.h"
-#include "reg_db.h"
-#include "reg_util_internal.h"
-#include "reg_backend_db.h"
-#include "reg_objects.h"
-#include "nt_printing.h"
-#include "util_tdb.h"
-#include "dbwrap.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
@@ -48,8 +39,6 @@ static int regdb_fetch_values_internal(struct db_context *db, const char* key,
 static bool regdb_store_values_internal(struct db_context *db, const char *key,
 					struct regval_ctr *values);
 
-static NTSTATUS create_sorted_subkeys(const char *key);
-
 /* List the deepest path into the registry.  All part components will be created.*/
 
 /* If you want to have a part of the path controlled by the tdb and part by
@@ -64,9 +53,6 @@ static const char *builtin_registry_paths[] = {
 	KEY_PRINTING_2K,
 	KEY_PRINTING_PORTS,
 	KEY_PRINTING,
-	KEY_PRINTING "\\Forms",
-	KEY_PRINTING "\\Printers",
-	KEY_PRINTING "\\Environments\\Windows NT x86\\Print Processors\\winprint",
 	KEY_SHARES,
 	KEY_EVENTLOG,
 	KEY_SMBCONF,
@@ -79,7 +65,7 @@ static const char *builtin_registry_paths[] = {
 	KEY_HKCU,
 	KEY_GP_USER_POLICY,
 	KEY_GP_USER_WIN_POLICY,
-	"HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon\\GPExtensions",
+	KEY_WINLOGON_GPEXT_PATH,
 	"HKLM\\SYSTEM\\CurrentControlSet\\Control\\Print\\Monitors",
 	KEY_PROD_OPTIONS,
 	"HKLM\\SYSTEM\\CurrentControlSet\\Control\\Terminal Server\\DefaultUserConfiguration",
@@ -107,7 +93,7 @@ static struct builtin_regkey_value builtin_registry_values[] = {
 	{ KEY_PRINTING_2K,
 		"DefaultSpoolDirectory", REG_SZ, { "C:\\Windows\\System32\\Spool\\Printers" } },
 	{ KEY_EVENTLOG,
-		"DisplayName", REG_SZ, { "Event Log" } },
+		"DisplayName", REG_SZ, { "Event Log" } }, 
 	{ KEY_EVENTLOG,
 		"ErrorControl", REG_DWORD, { (char*)0x00000001 } },
 	{ NULL, NULL, 0, { NULL } }
@@ -267,7 +253,7 @@ static void regdb_ctr_add_value(struct regval_ctr *ctr,
 	switch(value->type) {
 	case REG_DWORD:
 		regval_ctr_addvalue(ctr, value->valuename, REG_DWORD,
-				    (uint8_t *)&value->data.dw_value,
+				    (char*)&value->data.dw_value,
 				    sizeof(uint32));
 		break;
 
@@ -306,11 +292,10 @@ static NTSTATUS init_registry_data_action(struct db_context *db,
 	/* loop over all of the predefined values and add each component */
 
 	for (i=0; builtin_registry_values[i].path != NULL; i++) {
-		WERROR werr;
 
-		werr = regval_ctr_init(frame, &values);
-		if (!W_ERROR_IS_OK(werr)) {
-			status = werror_to_ntstatus(werr);
+		values = TALLOC_ZERO_P(frame, struct regval_ctr);
+		if (values == NULL) {
+			status = NT_STATUS_NO_MEMORY;
 			goto done;
 		}
 
@@ -358,8 +343,11 @@ WERROR init_registry_data(void)
 	}
 
 	for (i=0; builtin_registry_values[i].path != NULL; i++) {
-		werr = regval_ctr_init(frame, &values);
-		W_ERROR_NOT_OK_GOTO_DONE(werr);
+		values = TALLOC_ZERO_P(frame, struct regval_ctr);
+		if (values == NULL) {
+			werr = WERR_NOMEM;
+			goto done;
+		}
 
 		regdb_fetch_values_internal(regdb,
 					    builtin_registry_values[i].path,
@@ -396,112 +384,19 @@ done:
 	return werr;
 }
 
-static int regdb_normalize_keynames_fn(struct db_record *rec,
-				       void *private_data)
-{
-	TALLOC_CTX *mem_ctx = talloc_tos();
-	const char *keyname;
-	NTSTATUS status;
-
-	if (rec->key.dptr == NULL || rec->key.dsize == 0) {
-		return 0;
-	}
-
-	keyname = strchr((const char *) rec->key.dptr, '/');
-	if (keyname) {
-		struct db_record new_rec;
-
-		keyname = talloc_string_sub(mem_ctx,
-					    (const char *) rec->key.dptr,
-					    "/",
-					    "\\");
-
-		DEBUG(2, ("regdb_normalize_keynames_fn: Convert %s to %s\n",
-			  (const char *) rec->key.dptr,
-			  keyname));
-
-		new_rec.value = rec->value;
-		new_rec.key = string_term_tdb_data(keyname);
-		new_rec.private_data = rec->private_data;
-
-		/* Delete the original record and store the normalized key */
-		status = rec->delete_rec(rec);
-		if (!NT_STATUS_IS_OK(status)) {
-			DEBUG(0,("regdb_normalize_keynames_fn: "
-				 "tdb_delete for [%s] failed!\n",
-				 rec->key.dptr));
-			return 1;
-		}
-
-		status = rec->store(&new_rec, new_rec.value, TDB_REPLACE);
-		if (!NT_STATUS_IS_OK(status)) {
-			DEBUG(0,("regdb_normalize_keynames_fn: "
-				 "failed to store new record for [%s]!\n",
-				 keyname));
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-static WERROR regdb_store_regdb_version(uint32_t version)
-{
-	NTSTATUS status;
-	const char *version_keyname = "INFO/version";
-
-	if (!regdb) {
-		return WERR_CAN_NOT_COMPLETE;
-	}
-
-	status = dbwrap_trans_store_int32(regdb, version_keyname, version);
-	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(1, ("regdb_store_regdb_version: error storing %s = %d: %s\n",
-			  version_keyname, version, nt_errstr(status)));
-		return ntstatus_to_werror(status);
-	} else {
-		DEBUG(10, ("regdb_store_regdb_version: stored %s = %d\n",
-			  version_keyname, version));
-		return WERR_OK;
-	}
-}
-
-static WERROR regdb_upgrade_v1_to_v2(void)
-{
-	TALLOC_CTX *mem_ctx;
-	int rc;
-	WERROR werr;
-
-	mem_ctx = talloc_stackframe();
-	if (mem_ctx == NULL) {
-		return WERR_NOMEM;
-	}
-
-	rc = regdb->traverse(regdb, regdb_normalize_keynames_fn, mem_ctx);
-
-	talloc_destroy(mem_ctx);
-
-	if (rc == -1) {
-		return WERR_REG_IO_FAILURE;
-	}
-
-	werr = regdb_store_regdb_version(REGVER_V2);
-	return werr;
-}
-
 /***********************************************************************
  Open the registry database
  ***********************************************************************/
-
+ 
 WERROR regdb_init(void)
 {
 	const char *vstring = "INFO/version";
-	uint32 vers_id, expected_version;
+	uint32 vers_id;
 	WERROR werr;
 
 	if (regdb) {
-		DEBUG(10, ("regdb_init: incrementing refcount (%d->%d)\n",
-			   regdb_refcount, regdb_refcount+1));
+		DEBUG(10, ("regdb_init: incrementing refcount (%d)\n",
+			  regdb_refcount));
 		regdb_refcount++;
 		return WERR_OK;
 	}
@@ -517,56 +412,30 @@ WERROR regdb_init(void)
 				state_path("registry.tdb"), strerror(errno) ));
 			return werr;
 		}
-
+		
 		DEBUG(10,("regdb_init: Successfully created registry tdb\n"));
 	}
 
 	regdb_refcount = 1;
-	DEBUG(10, ("regdb_init: registry db openend. refcount reset (%d)\n",
-		   regdb_refcount));
-
-	expected_version = REGVER_V2;
 
 	vers_id = dbwrap_fetch_int32(regdb, vstring);
-	if (vers_id == -1) {
-		DEBUG(10, ("regdb_init: registry version uninitialized "
-			   "(got %d), initializing to version %d\n",
-			   vers_id, expected_version));
-
-		werr = regdb_store_regdb_version(expected_version);
-		return werr;
-	}
-
-	if (vers_id > expected_version || vers_id == 0) {
-		DEBUG(1, ("regdb_init: unknown registry version %d "
-			  "(code version = %d), refusing initialization\n",
-			  vers_id, expected_version));
-		return WERR_CAN_NOT_COMPLETE;
-	}
 
-	if (vers_id == REGVER_V1) {
-		DEBUG(10, ("regdb_init: got registry db version %d, upgrading "
-			   "to version %d\n", REGVER_V1, REGVER_V2));
-
-		if (regdb->transaction_start(regdb) != 0) {
-			return WERR_REG_IO_FAILURE;
-		}
-
-		werr = regdb_upgrade_v1_to_v2();
-		if (!W_ERROR_IS_OK(werr)) {
-			regdb->transaction_cancel(regdb);
-			return werr;
-		}
-
-		if (regdb->transaction_commit(regdb) != 0) {
-			return WERR_REG_IO_FAILURE;
+	if ( vers_id != REGVER_V1 ) {
+		NTSTATUS status;
+		/* any upgrade code here if needed */
+		DEBUG(10, ("regdb_init: got %s = %d != %d\n", vstring,
+			   vers_id, REGVER_V1));
+		status = dbwrap_trans_store_int32(regdb, vstring, REGVER_V1);
+		if (!NT_STATUS_IS_OK(status)) {
+			DEBUG(1, ("regdb_init: error storing %s = %d: %s\n",
+				  vstring, REGVER_V1, nt_errstr(status)));
+			return ntstatus_to_werror(status);
+		} else {
+			DEBUG(10, ("regdb_init: stored %s = %d\n",
+				  vstring, REGVER_V1));
 		}
-
-		vers_id = REGVER_V2;
 	}
 
-	/* future upgrade code should go here */
-
 	return WERR_OK;
 }
 
@@ -579,27 +448,25 @@ WERROR regdb_open( void )
 	WERROR result = WERR_OK;
 
 	if ( regdb ) {
-		DEBUG(10, ("regdb_open: incrementing refcount (%d->%d)\n",
-			   regdb_refcount, regdb_refcount+1));
+		DEBUG(10,("regdb_open: incrementing refcount (%d)\n", regdb_refcount));
 		regdb_refcount++;
 		return WERR_OK;
 	}
-
+	
 	become_root();
 
 	regdb = db_open(NULL, state_path("registry.tdb"), 0,
 			      REG_TDB_FLAGS, O_RDWR, 0600);
 	if ( !regdb ) {
 		result = ntstatus_to_werror( map_nt_error_from_unix( errno ) );
-		DEBUG(0,("regdb_open: Failed to open %s! (%s)\n",
+		DEBUG(0,("regdb_open: Failed to open %s! (%s)\n", 
 			state_path("registry.tdb"), strerror(errno) ));
 	}
 
 	unbecome_root();
 
 	regdb_refcount = 1;
-	DEBUG(10, ("regdb_open: registry db opened. refcount reset (%d)\n",
-		   regdb_refcount));
+	DEBUG(10,("regdb_open: refcount reset (%d)\n", regdb_refcount));
 
 	return result;
 }
@@ -615,8 +482,7 @@ int regdb_close( void )
 
 	regdb_refcount--;
 
-	DEBUG(10, ("regdb_close: decrementing refcount (%d->%d)\n",
-		   regdb_refcount+1, regdb_refcount));
+	DEBUG(10,("regdb_close: decrementing refcount (%d)\n", regdb_refcount));
 
 	if ( regdb_refcount > 0 )
 		return 0;
@@ -672,7 +538,7 @@ static WERROR regdb_delete_key_with_prefix(struct db_context *db,
 	if (prefix == NULL) {
 		path = discard_const_p(char, keyname);
 	} else {
-		path = talloc_asprintf(mem_ctx, "%s\\%s", prefix, keyname);
+		path = talloc_asprintf(mem_ctx, "%s/%s", prefix, keyname);
 		if (path == NULL) {
 			goto done;
 		}
@@ -717,14 +583,14 @@ static WERROR regdb_delete_key_lists(struct db_context *db, const char *keyname)
 
 	werr = regdb_delete_values(db, keyname);
 	if (!W_ERROR_IS_OK(werr)) {
-		DEBUG(1, (__location__ " Deleting %s\\%s failed: %s\n",
+		DEBUG(1, (__location__ " Deleting %s/%s failed: %s\n",
 			  REG_VALUE_PREFIX, keyname, win_errstr(werr)));
 		goto done;
 	}
 
 	werr = regdb_delete_secdesc(db, keyname);
 	if (!W_ERROR_IS_OK(werr)) {
-		DEBUG(1, (__location__ " Deleting %s\\%s failed: %s\n",
+		DEBUG(1, (__location__ " Deleting %s/%s failed: %s\n",
 			  REG_SECDESC_PREFIX, keyname, win_errstr(werr)));
 		goto done;
 	}
@@ -834,9 +700,22 @@ static WERROR regdb_store_keys_internal2(struct db_context *db,
 	W_ERROR_NOT_OK_GOTO_DONE(werr);
 
 	/*
-	 * recreate the sorted subkey cache for regdb_key_exists()
+	 * Delete a sorted subkey cache for regdb_key_exists, will be
+	 * recreated automatically
 	 */
-	werr = ntstatus_to_werror(create_sorted_subkeys(keyname));
+	keyname = talloc_asprintf(ctx, "%s/%s", REG_SORTED_SUBKEYS_PREFIX,
+				  keyname);
+	if (keyname == NULL) {
+		werr = WERR_NOMEM;
+		goto done;
+	}
+
+	werr = ntstatus_to_werror(dbwrap_delete_bystring(db, keyname));
+
+	/* don't treat WERR_NOT_FOUND as an error here */
+	if (W_ERROR_EQUAL(werr, WERR_NOT_FOUND)) {
+		werr = WERR_OK;
+	}
 
 done:
 	TALLOC_FREE(ctx);
@@ -915,7 +794,7 @@ static NTSTATUS regdb_store_keys_action(struct db_context *db,
 			continue;
 		}
 
-		path = talloc_asprintf(mem_ctx, "%s\\%s", store_ctx->key,
+		path = talloc_asprintf(mem_ctx, "%s/%s", store_ctx->key,
 				       oldkeyname);
 		if (!path) {
 			werr = WERR_NOMEM;
@@ -959,7 +838,7 @@ static NTSTATUS regdb_store_keys_action(struct db_context *db,
 	}
 
 	for (i=0; i<num_subkeys; i++) {
-		path = talloc_asprintf(mem_ctx, "%s\\%s", store_ctx->key,
+		path = talloc_asprintf(mem_ctx, "%s/%s", store_ctx->key,
 				regsubkey_ctr_specific_key(store_ctx->ctr, i));
 		if (!path) {
 			werr = WERR_NOMEM;
@@ -1202,7 +1081,7 @@ static WERROR regdb_delete_subkey(const char *key, const char *subkey)
 		goto done;
 	}
 
-	path = talloc_asprintf(mem_ctx, "%s\\%s", key, subkey);
+	path = talloc_asprintf(mem_ctx, "%s/%s", key, subkey);
 	if (path == NULL) {
 		werr = WERR_NOMEM;
 		goto done;
@@ -1246,7 +1125,7 @@ static TDB_DATA regdb_fetch_key_internal(struct db_context *db,
 
 /**
  * check whether a given key name represents a base key,
- * i.e one without a subkey separator ('\').
+ * i.e one without a subkey separator ('/' or '\').
  */
 static bool regdb_key_is_base_key(const char *key)
 {
@@ -1268,7 +1147,7 @@ static bool regdb_key_is_base_key(const char *key)
 		goto done;
 	}
 
-	ret = (strrchr(path, '\\') == NULL);
+	ret = (strrchr(path, '/') == NULL);
 
 done:
 	TALLOC_FREE(mem_ctx);
@@ -1298,9 +1177,9 @@ done:
  * recreated on demand.
  */
 
-static int cmp_keynames(char **p1, char **p2)
+static int cmp_keynames(const void *p1, const void *p2)
 {
-	return StrCaseCmp(*p1, *p2);
+	return StrCaseCmp(*((char **)p1), *((char **)p2));
 }
 
 struct create_sorted_subkeys_context {
@@ -1369,7 +1248,7 @@ static NTSTATUS create_sorted_subkeys_action(struct db_context *db,
 		len += strlen(sorted_subkeys[i])+1;
 	}
 
-	TYPESAFE_QSORT(sorted_subkeys, num_subkeys, cmp_keynames);
+	qsort(sorted_subkeys, num_subkeys, sizeof(char *), cmp_keynames);
 
 	buf = talloc_array(ctr, char, len);
 	if (buf == NULL) {
@@ -1397,8 +1276,7 @@ done:
 	return status;
 }
 
-static NTSTATUS create_sorted_subkeys_internal(const char *key,
-					       const char *sorted_keyname)
+static bool create_sorted_subkeys(const char *key, const char *sorted_keyname)
 {
 	NTSTATUS status;
 	struct create_sorted_subkeys_context sorted_ctx;
@@ -1410,26 +1288,7 @@ static NTSTATUS create_sorted_subkeys_internal(const char *key,
 				 create_sorted_subkeys_action,
 				 &sorted_ctx);
 
-	return status;
-}
-
-static NTSTATUS create_sorted_subkeys(const char *key)
-{
-	char *sorted_subkeys_keyname;
-	NTSTATUS status;
-
-	sorted_subkeys_keyname = talloc_asprintf(talloc_tos(), "%s\\%s",
-						 REG_SORTED_SUBKEYS_PREFIX,
-						 key);
-	if (sorted_subkeys_keyname == NULL) {
-		status = NT_STATUS_NO_MEMORY;
-		goto done;
-	}
-
-	status = create_sorted_subkeys_internal(key, sorted_subkeys_keyname);
-
-done:
-	return status;
+	return NT_STATUS_IS_OK(status);
 }
 
 struct scan_subkey_state {
@@ -1491,7 +1350,7 @@ static bool scan_parent_subkeys(struct db_context *db, const char *parent,
 		goto fail;
 	}
 
-	key = talloc_asprintf(talloc_tos(), "%s\\%s",
+	key = talloc_asprintf(talloc_tos(), "%s/%s",
 			      REG_SORTED_SUBKEYS_PREFIX, path);
 	if (key == NULL) {
 		goto fail;
@@ -1509,21 +1368,13 @@ static bool scan_parent_subkeys(struct db_context *db, const char *parent,
 	if (state.scanned) {
 		result = state.found;
 	} else {
-		NTSTATUS status;
-
 		res = db->transaction_start(db);
 		if (res != 0) {
-			DEBUG(0, ("error starting transaction\n"));
+			DEBUG(0, ("error starting transacion\n"));
 			goto fail;
 		}
 
-		DEBUG(2, (__location__ " WARNING: recreating the sorted "
-			  "subkeys cache for key '%s' from scan_parent_subkeys "
-			  "this should not happen (too frequently)...\n",
-			  path));
-
-		status = create_sorted_subkeys_internal(path, key);
-		if (!NT_STATUS_IS_OK(status)) {
+		if (!create_sorted_subkeys(path, key)) {
 			res = db->transaction_cancel(db);
 			if (res != 0) {
 				smb_panic("Failed to cancel transaction.");
@@ -1579,7 +1430,7 @@ static bool regdb_key_exists(struct db_context *db, const char *key)
 		goto done;
 	}
 
-	p = strrchr(path, '\\');
+	p = strrchr(path, '/');
 	if (p == NULL) {
 		/* this is a base key */
 		value = regdb_fetch_key_internal(db, mem_ctx, path);
@@ -1614,6 +1465,8 @@ static WERROR regdb_fetch_keys_internal(struct db_context *db, const char *key,
 
 	DEBUG(11,("regdb_fetch_keys: Enter key => [%s]\n", key ? key : "NULL"));
 
+	frame = talloc_stackframe();
+
 	if (!regdb_key_exists(db, key)) {
 		DEBUG(10, ("key [%s] not found\n", key));
 		werr = WERR_NOT_FOUND;
@@ -1703,8 +1556,12 @@ static int regdb_unpack_values(struct regval_ctr *values, uint8 *buf, int buflen
 				  &size,
 				  &data_p);
 
-		regval_ctr_addvalue(values, valuename, type,
-				(uint8_t *)data_p, size);
+		/* add the new value. Paranoid protective code -- make sure data_p is valid */
+
+		if (*valuename && size && data_p) {
+			regval_ctr_addvalue(values, valuename, type,
+					(const char *)data_p, size);
+		}
 		SAFE_FREE(data_p); /* 'B' option to tdb_unpack does a malloc() */
 
 		DEBUG(8,("specific: [%s], len: %d\n", valuename, size));
@@ -1759,7 +1616,6 @@ static int regdb_fetch_values_internal(struct db_context *db, const char* key,
 	TALLOC_CTX *ctx = talloc_stackframe();
 	int ret = 0;
 	TDB_DATA value;
-	WERROR werr;
 
 	DEBUG(10,("regdb_fetch_values: Looking for value of key [%s] \n", key));
 
@@ -1767,13 +1623,12 @@ static int regdb_fetch_values_internal(struct db_context *db, const char* key,
 		goto done;
 	}
 
-	keystr = talloc_asprintf(ctx, "%s\\%s", REG_VALUE_PREFIX, key);
+	keystr = talloc_asprintf(ctx, "%s/%s", REG_VALUE_PREFIX, key);
 	if (!keystr) {
 		goto done;
 	}
 
-	werr = regval_ctr_set_seqnum(values, db->get_seqnum(db));
-	W_ERROR_NOT_OK_GOTO_DONE(werr);
+	values->seqnum = db->get_seqnum(db);
 
 	value = regdb_fetch_key_internal(db, ctx, keystr);
 
@@ -1826,7 +1681,7 @@ static bool regdb_store_values_internal(struct db_context *db, const char *key,
 
 	SMB_ASSERT( len == data.dsize );
 
-	keystr = talloc_asprintf(ctx, "%s\\%s", REG_VALUE_PREFIX, key );
+	keystr = talloc_asprintf(ctx, "%s/%s", REG_VALUE_PREFIX, key );
 	if (!keystr) {
 		goto done;
 	}
@@ -1875,17 +1730,12 @@ static WERROR regdb_get_secdesc(TALLOC_CTX *mem_ctx, const char *key,
 		goto done;
 	}
 
-	tdbkey = talloc_asprintf(tmp_ctx, "%s\\%s", REG_SECDESC_PREFIX, key);
-	if (tdbkey == NULL) {
-		err = WERR_NOMEM;
-		goto done;
-	}
-
-	tdbkey = normalize_reg_path(tmp_ctx, tdbkey);
+	tdbkey = talloc_asprintf(tmp_ctx, "%s/%s", REG_SECDESC_PREFIX, key);
 	if (tdbkey == NULL) {
 		err = WERR_NOMEM;
 		goto done;
 	}
+	normalize_dbkey(tdbkey);
 
 	data = dbwrap_fetch_bystring(regdb, tmp_ctx, tdbkey);
 	if (data.dptr == NULL) {
@@ -1920,16 +1770,11 @@ static WERROR regdb_set_secdesc(const char *key,
 		goto done;
 	}
 
-	tdbkey = talloc_asprintf(mem_ctx, "%s\\%s", REG_SECDESC_PREFIX, key);
-	if (tdbkey == NULL) {
-		goto done;
-	}
-
-	tdbkey = normalize_reg_path(mem_ctx, tdbkey);
+	tdbkey = talloc_asprintf(mem_ctx, "%s/%s", REG_SECDESC_PREFIX, key);
 	if (tdbkey == NULL) {
-		err = WERR_NOMEM;
 		goto done;
 	}
+	normalize_dbkey(tdbkey);
 
 	if (secdesc == NULL) {
 		/* assuming a delete */
@@ -1958,13 +1803,13 @@ bool regdb_subkeys_need_update(struct regsubkey_ctr *subkeys)
 
 bool regdb_values_need_update(struct regval_ctr *values)
 {
-	return (regdb_get_seqnum() != regval_ctr_get_seqnum(values));
+	return (regdb_get_seqnum() != values->seqnum);
 }
 
-/*
+/* 
  * Table of function pointers for default access
  */
-
+ 
 struct registry_ops regdb_ops = {
 	.fetch_subkeys = regdb_fetch_keys,
 	.fetch_values = regdb_fetch_values,
diff --git a/source3/registry/reg_backend_db.h b/source3/registry/reg_backend_db.h
deleted file mode 100644
index 9d5ff90837..0000000000
--- a/source3/registry/reg_backend_db.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  Virtual Windows Registry Layer
- *  Copyright (C) Gerald Carter                     2002-2005
- *  Copyright (C) Michael Adam                      2007-2009
- *
- *  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/>.
- */
-
-#ifndef _REG_BACKEND_DB_H
-#define _REG_BACKEND_DB_H
-
-#include "registry.h"
-
-WERROR init_registry_key(const char *add_path);
-WERROR init_registry_data(void);
-WERROR regdb_init(void);
-WERROR regdb_open( void );
-int regdb_close( void );
-WERROR regdb_transaction_start(void);
-WERROR regdb_transaction_commit(void);
-WERROR regdb_transaction_cancel(void);
-int regdb_get_seqnum(void);
-bool regdb_store_keys(const char *key, struct regsubkey_ctr *ctr);
-int regdb_fetch_keys(const char *key, struct regsubkey_ctr *ctr);
-int regdb_fetch_values(const char* key, struct regval_ctr *values);
-bool regdb_store_values(const char *key, struct regval_ctr *values);
-bool regdb_subkeys_need_update(struct regsubkey_ctr *subkeys);
-bool regdb_values_need_update(struct regval_ctr *values);
-
-#endif /* _REG_BACKEND_DB_H */
diff --git a/source3/registry/reg_backend_hkpt_params.c b/source3/registry/reg_backend_hkpt_params.c
index d34d1acf3c..ca37b59522 100644
--- a/source3/registry/reg_backend_hkpt_params.c
+++ b/source3/registry/reg_backend_hkpt_params.c
@@ -25,9 +25,6 @@
  */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_perfcount.h"
-#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
@@ -45,7 +42,7 @@ static int hkpt_params_fetch_values(const char *key, struct regval_ctr *regvals)
 
 	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, (uint8 *)buffer,
+	regval_ctr_addvalue(regvals, "Counters", REG_MULTI_SZ, buffer,
 			    buffer_size);
 
 	if(buffer_size > 0) {
@@ -53,7 +50,7 @@ static int hkpt_params_fetch_values(const char *key, struct regval_ctr *regvals)
 	}
 
 	buffer_size = reg_perfcount_get_counter_help(base_index, &buffer);
-	regval_ctr_addvalue(regvals, "Help", REG_MULTI_SZ, (uint8 *)buffer, buffer_size);
+	regval_ctr_addvalue(regvals, "Help", REG_MULTI_SZ, buffer, buffer_size);
 	if(buffer_size > 0) {
 		SAFE_FREE(buffer);
 	}
diff --git a/source3/registry/reg_backend_netlogon_params.c b/source3/registry/reg_backend_netlogon_params.c
index a98c92e4d6..6fc87efb1d 100644
--- a/source3/registry/reg_backend_netlogon_params.c
+++ b/source3/registry/reg_backend_netlogon_params.c
@@ -25,9 +25,6 @@
  */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_objects.h"
-#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
@@ -43,7 +40,7 @@ static int netlogon_params_fetch_values(const char *key, struct regval_ctr *regv
 	}
 
 	regval_ctr_addvalue(regvals, "RefusePasswordChange", REG_DWORD,
-			    (uint8_t *)&dwValue, sizeof(dwValue));
+			    (char*)&dwValue, sizeof(dwValue));
 
 	return regval_ctr_numvals(regvals);
 }
diff --git a/source3/registry/reg_backend_perflib.c b/source3/registry/reg_backend_perflib.c
index a46c574ba1..54e6cfe922 100644
--- a/source3/registry/reg_backend_perflib.c
+++ b/source3/registry/reg_backend_perflib.c
@@ -25,18 +25,14 @@
  */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_util_internal.h"
-#include "reg_perfcount.h"
-#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 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"
+#define KEY_PERFLIB_NORM	"HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PERFLIB"
+#define KEY_PERFLIB_009_NORM	"HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PERFLIB/009"
 
 static int perflib_params(struct regval_ctr *regvals)
 {
@@ -46,12 +42,12 @@ static int perflib_params(struct regval_ctr *regvals)
 	int version = 0x00010001;
 	
 	base_index = reg_perfcount_get_base_index();
-	regval_ctr_addvalue(regvals, "Base Index", REG_DWORD, (uint8_t *)&base_index, sizeof(base_index));
+	regval_ctr_addvalue(regvals, "Base Index", REG_DWORD, (char *)&base_index, sizeof(base_index));
 	last_counter = reg_perfcount_get_last_counter(base_index);
-	regval_ctr_addvalue(regvals, "Last Counter", REG_DWORD, (uint8_t *)&last_counter, sizeof(last_counter));
+	regval_ctr_addvalue(regvals, "Last Counter", REG_DWORD, (char *)&last_counter, sizeof(last_counter));
 	last_help = reg_perfcount_get_last_help(last_counter);
-	regval_ctr_addvalue(regvals, "Last Help", REG_DWORD, (uint8_t *)&last_help, sizeof(last_help));
-	regval_ctr_addvalue(regvals, "Version", REG_DWORD, (uint8_t *)&version, sizeof(version));
+	regval_ctr_addvalue(regvals, "Last Help", REG_DWORD, (char *)&last_help, sizeof(last_help));
+	regval_ctr_addvalue(regvals, "Version", REG_DWORD, (char *)&version, sizeof(version));
 
 	return regval_ctr_numvals( regvals );
 }
@@ -64,11 +60,11 @@ static int perflib_009_params(struct regval_ctr *regvals)
 
 	base_index = reg_perfcount_get_base_index();
 	buffer_size = reg_perfcount_get_counter_names(base_index, &buffer);
-	regval_ctr_addvalue(regvals, "Counter", REG_MULTI_SZ, (uint8_t *)buffer, buffer_size);
+	regval_ctr_addvalue(regvals, "Counter", 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, (uint8_t *)buffer, buffer_size);
+	regval_ctr_addvalue(regvals, "Help", REG_MULTI_SZ, buffer, buffer_size);
 	if(buffer_size > 0)
 		SAFE_FREE(buffer);
 	
diff --git a/source3/registry/reg_backend_printing.c b/source3/registry/reg_backend_printing.c
index f76495253e..90ccc33c4c 100644
--- a/source3/registry/reg_backend_printing.c
+++ b/source3/registry/reg_backend_printing.c
@@ -2,7 +2,6 @@
  *  Unix SMB/CIFS implementation.
  *  Virtual Windows Registry Layer
  *  Copyright (C) Gerald Carter                     2002-2005
- *  Copyright (c) Andreas Schneider <asn@samba.org> 2010
  *
  *  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
@@ -21,16 +20,20 @@
 /* Implementation of registry virtual views for printing information */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_util_internal.h"
-#include "reg_backend_db.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
-/* registry paths used in the print_registry[] */
-#define KEY_CONTROL_PRINTERS	"HKLM\\SYSTEM\\CURRENTCONTROLSET\\CONTROL\\PRINT\\PRINTERS"
-#define KEY_WINNT_PRINTERS	"HKLM\\SOFTWARE\\MICROSOFT\\WINDOWS NT\\CURRENTVERSION\\PRINT\\PRINTERS"
+/* registrt paths used in the print_registry[] */
+
+#define KEY_MONITORS		"HKLM/SYSTEM/CURRENTCONTROLSET/CONTROL/PRINT/MONITORS"
+#define KEY_FORMS		"HKLM/SYSTEM/CURRENTCONTROLSET/CONTROL/PRINT/FORMS"
+#define KEY_CONTROL_PRINTERS	"HKLM/SYSTEM/CURRENTCONTROLSET/CONTROL/PRINT/PRINTERS"
+#define KEY_ENVIRONMENTS	"HKLM/SYSTEM/CURRENTCONTROLSET/CONTROL/PRINT/ENVIRONMENTS"
+#define KEY_CONTROL_PRINT	"HKLM/SYSTEM/CURRENTCONTROLSET/CONTROL/PRINT"
+#define KEY_WINNT_PRINTERS	"HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PRINT/PRINTERS"
+#define KEY_WINNT_PRINT		"HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PRINT"
+#define KEY_PORTS		"HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PORTS"
 
 /* callback table for various registry paths below the ones we service in this module */
 
@@ -47,34 +50,147 @@ struct reg_dyn_tree {
 
 /*********************************************************************
  *********************************************************************
+ ** Utility Functions
+ *********************************************************************
+ *********************************************************************/
+
+/***********************************************************************
+ simple function to prune a pathname down to the basename of a file
+ **********************************************************************/
+
+static const char *dos_basename(const char *path)
+{
+	const char *p;
+
+	if (!(p = strrchr( path, '\\'))) {
+		p = path;
+	} else {
+		p++;
+	}
+
+	return p;
+}
+
+/*********************************************************************
+ *********************************************************************
+ ** "HKLM/SYSTEM/CURRENTCONTROLSET/CONTROL/PRINT/FORMS"
+ *********************************************************************
+ *********************************************************************/
+
+static int key_forms_fetch_keys(const char *key, struct regsubkey_ctr *subkeys)
+{
+	char *p = reg_remaining_path(talloc_tos(), key + strlen(KEY_FORMS));
+
+	/* no keys below Forms */
+
+	if (p) {
+		return -1;
+	}
+
+	return 0;
+}
+
+/**********************************************************************
+ *********************************************************************/
+
+static int key_forms_fetch_values(const char *key, struct regval_ctr *values)
+{
+	uint32 		data[8];
+	int		i, num_values, form_index = 1;
+	nt_forms_struct *forms_list = NULL;
+	nt_forms_struct *form;
+
+	DEBUG(10,("print_values_forms: key=>[%s]\n", key ? key : "NULL" ));
+
+	num_values = get_ntforms( &forms_list );
+
+	DEBUG(10,("hive_forms_fetch_values: [%d] user defined forms returned\n",
+		num_values));
+
+	/* handle user defined forms */
+
+	for ( i=0; i<num_values; i++ ) {
+		form = &forms_list[i];
+
+		data[0] = form->width;
+		data[1] = form->length;
+		data[2] = form->left;
+		data[3] = form->top;
+		data[4] = form->right;
+		data[5] = form->bottom;
+		data[6] = form_index++;
+		data[7] = form->flag;
+
+		regval_ctr_addvalue( values, form->name, REG_BINARY, (char*)data, sizeof(data) );	
+	}
+
+	SAFE_FREE( forms_list );
+	forms_list = NULL;
+
+	/* handle built-on forms */
+
+	num_values = get_builtin_ntforms( &forms_list );
+
+	DEBUG(10,("print_subpath_values_forms: [%d] built-in forms returned\n",
+		num_values));
+
+	for ( i=0; i<num_values; i++ ) {
+		form = &forms_list[i];
+
+		data[0] = form->width;
+		data[1] = form->length;
+		data[2] = form->left;
+		data[3] = form->top;
+		data[4] = form->right;
+		data[5] = form->bottom;
+		data[6] = form_index++;
+		data[7] = form->flag;
+
+		regval_ctr_addvalue(values, form->name, REG_BINARY, (char*)data, sizeof(data) );
+	}
+
+	SAFE_FREE(forms_list);
+
+	return regval_ctr_numvals(values);
+}
+
+/*********************************************************************
+ *********************************************************************
  ** "HKLM/SYSTEM/CURRENTCONTROLSET/CONTROL/PRINT/PRINTERS"
  ** "HKLM/SOFTWARE/MICROSOFT/WINDOWS NT/CURRENTVERSION/PRINT/PRINTERS"
  *********************************************************************
  *********************************************************************/
 
-static char *create_printer_registry_path(TALLOC_CTX *mem_ctx, const char *key) {
-	char *path;
-	char *subkey = NULL;
+/*********************************************************************
+ strip off prefix for printers key.  DOes return a pointer to static
+ memory.
+ *********************************************************************/
+
+static char *strip_printers_prefix(const char *key)
+{
+	char *subkeypath = NULL;
+	char *path = NULL;
+	TALLOC_CTX *ctx = talloc_tos();
 
-	path = talloc_strdup(mem_ctx, key);
-	if (path == NULL) {
+	path = talloc_strdup(ctx, key);
+	if (!path) {
 		return NULL;
 	}
-
-	path = normalize_reg_path(mem_ctx, path);
-	if (path == NULL) {
+	path = normalize_reg_path(ctx, path);
+	if (!path) {
 		return NULL;
 	}
 
-	if (strncmp(path, KEY_CONTROL_PRINTERS, strlen(KEY_CONTROL_PRINTERS)) == 0) {
-		subkey = reg_remaining_path(mem_ctx, key + strlen(KEY_CONTROL_PRINTERS));
-		if (subkey == NULL) {
-			return NULL;
-		}
-		return talloc_asprintf(mem_ctx, "%s\\%s", KEY_WINNT_PRINTERS, subkey);
+	/* normalizing the path does not change length, just key delimiters and case */
+
+	if (strncmp(path, KEY_WINNT_PRINTERS, strlen(KEY_WINNT_PRINTERS)) == 0) {
+		subkeypath = reg_remaining_path(ctx, key + strlen(KEY_WINNT_PRINTERS));
+	} else {
+		subkeypath = reg_remaining_path(ctx, key + strlen(KEY_CONTROL_PRINTERS));
 	}
 
-	return NULL;
+	TALLOC_FREE(path);
+	return subkeypath;
 }
 
 /*********************************************************************
@@ -82,16 +198,113 @@ static char *create_printer_registry_path(TALLOC_CTX *mem_ctx, const char *key)
 
 static int key_printers_fetch_keys( const char *key, struct regsubkey_ctr *subkeys )
 {
-	TALLOC_CTX *ctx = talloc_tos();
+	int n_services = lp_numservices();
+	int snum;
+	fstring sname;
+	int i;
+	int num_subkeys = 0;
 	char *printers_key;
+	char *printername, *printerdatakey;
+	NT_PRINTER_INFO_LEVEL *printer = NULL;
+	fstring *subkey_names = NULL;
 
-	printers_key = create_printer_registry_path(ctx, key);
-	if (printers_key == NULL) {
-		/* normalize on the 'HKLM\SOFTWARE\....\Print\Printers' key */
-		return regdb_fetch_keys(KEY_WINNT_PRINTERS, subkeys);
+	DEBUG(10,("key_printers_fetch_keys: key=>[%s]\n", key ? key : "NULL" ));
+
+	printers_key = strip_printers_prefix( key );
+
+	if ( !printers_key ) {
+		/* enumerate all printers */
+
+		for (snum=0; snum<n_services; snum++) {
+			if ( !(lp_snum_ok(snum) && lp_print_ok(snum) ) )
+				continue;
+
+			/* don't report the [printers] share */
+
+			if ( strequal( lp_servicename(snum), PRINTERS_NAME ) )
+				continue;
+
+			fstrcpy( sname, lp_servicename(snum) );
+
+			regsubkey_ctr_addkey( subkeys, sname );
+		}
+
+		num_subkeys = regsubkey_ctr_numkeys( subkeys );
+		goto done;
+	}
+
+	/* get information for a specific printer */
+
+	if (!reg_split_path( printers_key, &printername, &printerdatakey )) {
+		return -1;
+	}
+
+	/* validate the printer name */
+
+	for (snum=0; snum<n_services; snum++) {
+		if ( !lp_snum_ok(snum) || !lp_print_ok(snum) )
+			continue;
+		if (strequal( lp_servicename(snum), printername ) )
+			break;
+	}
+
+	if ( snum>=n_services
+		|| !W_ERROR_IS_OK( get_a_printer(NULL, &printer, 2, printername) ) ) 
+	{
+		return -1;
+	}
+
+	num_subkeys = get_printer_subkeys( printer->info_2->data, printerdatakey?printerdatakey:"", &subkey_names );
+	
+	for ( i=0; i<num_subkeys; i++ )
+		regsubkey_ctr_addkey( subkeys, subkey_names[i] );
+	
+	free_a_printer( &printer, 2 );
+			
+	/* no other subkeys below here */
+
+done:	
+	SAFE_FREE( subkey_names );
+	
+	return num_subkeys;
+}
+
+/**********************************************************************
+ Take a list of names and call add_printer_hook() if necessary
+ Note that we do this a little differently from Windows since the 
+ keyname is the sharename and not the printer name.
+ *********************************************************************/
+
+static bool add_printers_by_registry( struct regsubkey_ctr *subkeys )
+{
+	int i, num_keys, snum;
+	char *printername;
+	NT_PRINTER_INFO_LEVEL_2 info2;
+	NT_PRINTER_INFO_LEVEL printer;
+	
+	ZERO_STRUCT( info2 );
+	printer.info_2 = &info2;
+	
+	num_keys = regsubkey_ctr_numkeys( subkeys );
+	
+	become_root();
+	for ( i=0; i<num_keys; i++ ) {
+		printername = regsubkey_ctr_specific_key( subkeys, i );
+		snum = find_service( printername );
+		
+		/* just verify a valied snum for now */
+		if ( snum == -1 ) {
+			fstrcpy( info2.printername, printername );
+			fstrcpy( info2.sharename, printername );
+			if ( !add_printer_hook(talloc_tos(), NULL, &printer ) ) {
+				DEBUG(0,("add_printers_by_registry: Failed to add printer [%s]\n",
+					printername));
+			}	
+		}
 	}
+	unbecome_root();
 
-	return regdb_fetch_keys(printers_key, subkeys);
+	return True;
 }
 
 /**********************************************************************
@@ -99,16 +312,145 @@ static int key_printers_fetch_keys( const char *key, struct regsubkey_ctr *subke
 
 static bool key_printers_store_keys( const char *key, struct regsubkey_ctr *subkeys )
 {
-	TALLOC_CTX *ctx = talloc_tos();
 	char *printers_key;
+	char *printername, *printerdatakey;
+	NT_PRINTER_INFO_LEVEL *printer = NULL;
+	int i, num_subkeys, num_existing_keys;
+	char *subkeyname;
+	fstring *existing_subkeys = NULL;
+	
+	printers_key = strip_printers_prefix( key );
+	
+	if ( !printers_key ) {
+		/* have to deal with some new or deleted printer */
+		return add_printers_by_registry( subkeys );
+	}
+	
+	if (!reg_split_path( printers_key, &printername, &printerdatakey )) {
+		return False;
+	}
+	
+	/* lookup the printer */
+	
+	if ( !W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, printername)) ) {
+		DEBUG(0,("key_printers_store_keys: Tried to store subkey for bad printername %s\n", 
+			printername));
+		return False;
+	}
+	
+	/* get the top level printer keys */
+	
+	num_existing_keys = get_printer_subkeys( printer->info_2->data, "", &existing_subkeys );
+	
+	for ( i=0; i<num_existing_keys; i++ ) {
+	
+		/* remove the key if it has been deleted */
+		
+		if ( !regsubkey_ctr_key_exists( subkeys, existing_subkeys[i] ) ) {
+			DEBUG(5,("key_printers_store_keys: deleting key %s\n", 
+				existing_subkeys[i]));
+			delete_printer_key( printer->info_2->data, existing_subkeys[i] );
+		}
+	}
 
-	printers_key = create_printer_registry_path(ctx, key);
-	if (printers_key == NULL) {
-		/* normalize on the 'HKLM\SOFTWARE\....\Print\Printers' key */
-		return regdb_store_keys(KEY_WINNT_PRINTERS, subkeys);
+	num_subkeys = regsubkey_ctr_numkeys( subkeys );
+	for ( i=0; i<num_subkeys; i++ ) {
+		subkeyname = regsubkey_ctr_specific_key(subkeys, i);
+		/* add any missing printer keys */
+		if ( lookup_printerkey(printer->info_2->data, subkeyname) == -1 ) {
+			DEBUG(5,("key_printers_store_keys: adding key %s\n", 
+				existing_subkeys[i]));
+			if ( add_new_printer_key( printer->info_2->data, subkeyname ) == -1 ) {
+				SAFE_FREE( existing_subkeys );
+				return False;
+			}
+		}
+	}
+	
+	/* write back to disk */
+	
+	mod_a_printer( printer, 2 );
+	
+	/* cleanup */
+	
+	free_a_printer( &printer, 2 );
+
+	SAFE_FREE( existing_subkeys );
+
+	return True;
+}
+
+/**********************************************************************
+ *********************************************************************/
+
+static void fill_in_printer_values(NT_PRINTER_INFO_LEVEL_2 *info2, struct regval_ctr *values)
+{
+	struct spoolss_DeviceMode *devmode;
+	char 		*p;
+	uint32 printer_status = PRINTER_STATUS_OK;
+	
+	regval_ctr_addvalue( values, "Attributes",       REG_DWORD, (char*)&info2->attributes,       sizeof(info2->attributes) );
+	regval_ctr_addvalue( values, "Priority",         REG_DWORD, (char*)&info2->priority,         sizeof(info2->attributes) );
+	regval_ctr_addvalue( values, "ChangeID",         REG_DWORD, (char*)&info2->changeid,         sizeof(info2->changeid) );
+	regval_ctr_addvalue( values, "Default Priority", REG_DWORD, (char*)&info2->default_priority, sizeof(info2->default_priority) );
+	
+	/* lie and say everything is ok since we don't want to call print_queue_length() to get the real status */
+	regval_ctr_addvalue( values, "Status",           REG_DWORD, (char*)&printer_status,          sizeof(info2->status) );
+
+	regval_ctr_addvalue( values, "StartTime",        REG_DWORD, (char*)&info2->starttime,        sizeof(info2->starttime) );
+	regval_ctr_addvalue( values, "UntilTime",        REG_DWORD, (char*)&info2->untiltime,        sizeof(info2->untiltime) );
+
+	/* strip the \\server\ from this string */
+	if ( !(p = strrchr( info2->printername, '\\' ) ) )
+		p = info2->printername;
+	else
+		p++;
+
+	regval_ctr_addvalue_sz(values, "Name", p);
+	regval_ctr_addvalue_sz(values, "Location", info2->location);
+	regval_ctr_addvalue_sz(values, "Description", info2->comment);
+	regval_ctr_addvalue_sz(values, "Parameters", info2->parameters);
+	regval_ctr_addvalue_sz(values, "Port", info2->portname);
+	regval_ctr_addvalue_sz(values, "Share Name", info2->sharename);
+	regval_ctr_addvalue_sz(values, "Printer Driver", info2->drivername);
+	regval_ctr_addvalue_sz(values, "Separator File", info2->sepfile);
+	regval_ctr_addvalue_sz(values, "Print Processor", "WinPrint");
+	regval_ctr_addvalue_sz(values, "Datatype", "RAW");
+
+	/* stream the device mode */
+
+	devmode = construct_dev_mode(values,info2->sharename);
+	if (devmode) {
+		DATA_BLOB blob;
+		enum ndr_err_code ndr_err;
+
+		ndr_err = ndr_push_struct_blob(&blob, values, NULL, devmode,
+				(ndr_push_flags_fn_t)ndr_push_spoolss_DeviceMode);
+
+		if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+			regval_ctr_addvalue(values, "Default Devmode", REG_BINARY,
+					    (const char *)blob.data, blob.length);
+		}
+	}
+
+	/* stream the printer security descriptor */
+
+	if (info2->secdesc_buf &&
+	    info2->secdesc_buf->sd &&
+	    info2->secdesc_buf->sd_size)
+	{
+		NTSTATUS status;
+		DATA_BLOB blob;
+
+		status = marshall_sec_desc(values, info2->secdesc_buf->sd,
+					   &blob.data, &blob.length);
+		if (NT_STATUS_IS_OK(status)) {
+			regval_ctr_addvalue(values, "Security", REG_BINARY,
+					    (const char *)blob.data, blob.length);
+		}
 	}
 
-	return regdb_store_keys(printers_key, subkeys);
+	return;
 }
 
 /**********************************************************************
@@ -116,33 +458,633 @@ static bool key_printers_store_keys( const char *key, struct regsubkey_ctr *subk
 
 static int key_printers_fetch_values(const char *key, struct regval_ctr *values)
 {
-	TALLOC_CTX *ctx = talloc_tos();
-	char *printers_key;
+	int 		num_values;
+	char		*printers_key;
+	char		*printername, *printerdatakey;
+	NT_PRINTER_INFO_LEVEL 	*printer = NULL;
+	NT_PRINTER_DATA	*p_data;
+	int		i, key_index;
+	
+	printers_key = strip_printers_prefix( key );	
+	
+	/* top level key values stored in the registry has no values */
+	
+	if ( !printers_key ) {
+		/* normalize to the 'HKLM\SOFTWARE\...\Print\Printers' key */
+		return regdb_fetch_values( KEY_WINNT_PRINTERS, values );
+	}
+	
+	/* lookup the printer object */
+	
+	if (!reg_split_path( printers_key, &printername, &printerdatakey )) {
+		return -1;
+	}
+	
+	if ( !W_ERROR_IS_OK( get_a_printer(NULL, &printer, 2, printername) ) )
+		goto done;
+		
+	if ( !printerdatakey ) {
+		fill_in_printer_values( printer->info_2, values );
+		goto done;
+	}
+		
+	/* iterate over all printer data keys and fill the regval container */
+	
+	p_data = printer->info_2->data;
+	if ( (key_index = lookup_printerkey( p_data, printerdatakey )) == -1  ) {
+		/* failure....should never happen if the client has a valid open handle first */
+		DEBUG(10,("key_printers_fetch_values: Unknown keyname [%s]\n", printerdatakey));
+		free_a_printer( &printer, 2 );
+		return -1;
+	}
+	
+	num_values = regval_ctr_numvals( p_data->keys[key_index].values );	
+	for ( i=0; i<num_values; i++ )
+		regval_ctr_copyvalue( values, regval_ctr_specific_value(p_data->keys[key_index].values, i) );
+			
 
-	printers_key = create_printer_registry_path(ctx, key);
-	if (printers_key == NULL) {
-		/* normalize on the 'HKLM\SOFTWARE\....\Print\Printers' key */
-		return regdb_fetch_values(KEY_WINNT_PRINTERS, values);
+done:
+	if ( printer )
+		free_a_printer( &printer, 2 );
+		
+	return regval_ctr_numvals( values );
+}
+
+/**********************************************************************
+ *********************************************************************/
+
+#define REG_IDX_ATTRIBUTES		1
+#define REG_IDX_PRIORITY		2
+#define REG_IDX_DEFAULT_PRIORITY	3
+#define REG_IDX_CHANGEID		4
+#define REG_IDX_STATUS			5
+#define REG_IDX_STARTTIME		6
+#define REG_IDX_NAME			7
+#define REG_IDX_LOCATION		8
+#define REG_IDX_DESCRIPTION		9
+#define REG_IDX_PARAMETERS		10
+#define REG_IDX_PORT			12
+#define REG_IDX_SHARENAME		13
+#define REG_IDX_DRIVER			14
+#define REG_IDX_SEP_FILE		15
+#define REG_IDX_PRINTPROC		16
+#define REG_IDX_DATATYPE		17
+#define REG_IDX_DEVMODE			18
+#define REG_IDX_SECDESC			19
+#define REG_IDX_UNTILTIME		20
+
+struct {
+	const char *name;
+	int index;	
+} printer_values_map[] = {
+	{ "Attributes", 	REG_IDX_ATTRIBUTES },
+	{ "Priority", 		REG_IDX_PRIORITY },
+	{ "Default Priority", 	REG_IDX_DEFAULT_PRIORITY },
+	{ "ChangeID", 		REG_IDX_CHANGEID },
+	{ "Status", 		REG_IDX_STATUS },
+	{ "StartTime", 		REG_IDX_STARTTIME },
+	{ "UntilTime",	 	REG_IDX_UNTILTIME },
+	{ "Name", 		REG_IDX_NAME },
+	{ "Location", 		REG_IDX_LOCATION },
+	{ "Description", 	REG_IDX_DESCRIPTION },
+	{ "Parameters", 	REG_IDX_PARAMETERS },
+	{ "Port", 		REG_IDX_PORT },
+	{ "Share Name", 	REG_IDX_SHARENAME },
+	{ "Printer Driver", 	REG_IDX_DRIVER },
+	{ "Separator File", 	REG_IDX_SEP_FILE },
+	{ "Print Processor", 	REG_IDX_PRINTPROC },
+	{ "Datatype", 		REG_IDX_DATATYPE },
+	{ "Default Devmode", 	REG_IDX_DEVMODE },
+	{ "Security", 		REG_IDX_SECDESC },
+	{ NULL, -1 }
+};
+
+
+static int find_valuename_index( const char *valuename )
+{
+	int i;
+	
+	for ( i=0; printer_values_map[i].name; i++ ) {
+		if ( strequal( valuename, printer_values_map[i].name ) )
+			return printer_values_map[i].index;
 	}
+	
+	return -1;
+}
+
+/**********************************************************************
+ *********************************************************************/
 
-	return regdb_fetch_values(printers_key, values);
+static void pull_reg_sz_fstring(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, fstring s)
+{
+	const char *str;
+	pull_reg_sz(mem_ctx, blob, &str);
+	fstrcpy(s, str);
 }
 
+static void convert_values_to_printer_info_2(TALLOC_CTX *mem_ctx,
+					     NT_PRINTER_INFO_LEVEL_2 *printer2,
+					     struct regval_ctr *values)
+{
+	int num_values = regval_ctr_numvals( values );
+	uint32 value_index;
+	struct regval_blob *val;
+	int i;
+	
+	for ( i=0; i<num_values; i++ ) {
+		DATA_BLOB blob;
+		val = regval_ctr_specific_value( values, i );
+		value_index = find_valuename_index( regval_name( val ) );
+
+		blob = data_blob_const(regval_data_p(val), regval_size(val));
+		
+		switch( value_index ) {
+			case REG_IDX_ATTRIBUTES:
+				printer2->attributes = (uint32)(*regval_data_p(val));
+				break;
+			case REG_IDX_PRIORITY:
+				printer2->priority = (uint32)(*regval_data_p(val));
+				break;
+			case REG_IDX_DEFAULT_PRIORITY:
+				printer2->default_priority = (uint32)(*regval_data_p(val));
+				break;
+			case REG_IDX_CHANGEID:
+				printer2->changeid = (uint32)(*regval_data_p(val));
+				break;
+			case REG_IDX_STARTTIME:
+				printer2->starttime = (uint32)(*regval_data_p(val));
+				break;
+			case REG_IDX_UNTILTIME:
+				printer2->untiltime = (uint32)(*regval_data_p(val));
+				break;
+			case REG_IDX_NAME:
+				pull_reg_sz_fstring(mem_ctx, &blob, printer2->printername);
+				break;
+			case REG_IDX_LOCATION:
+				pull_reg_sz_fstring(mem_ctx, &blob, printer2->location);
+				break;
+			case REG_IDX_DESCRIPTION:
+				pull_reg_sz_fstring(mem_ctx, &blob, printer2->comment);
+				break;
+			case REG_IDX_PARAMETERS:
+				pull_reg_sz_fstring(mem_ctx, &blob, printer2->parameters);
+				break;
+			case REG_IDX_PORT:
+				pull_reg_sz_fstring(mem_ctx, &blob, printer2->portname);
+				break;
+			case REG_IDX_SHARENAME:
+				pull_reg_sz_fstring(mem_ctx, &blob, printer2->sharename);
+				break;
+			case REG_IDX_DRIVER:
+				pull_reg_sz_fstring(mem_ctx, &blob, printer2->drivername);
+				break;
+			case REG_IDX_SEP_FILE:
+				pull_reg_sz_fstring(mem_ctx, &blob, printer2->sepfile);
+				break;
+			case REG_IDX_PRINTPROC:
+				pull_reg_sz_fstring(mem_ctx, &blob, printer2->printprocessor);
+				break;
+			case REG_IDX_DATATYPE:
+				pull_reg_sz_fstring(mem_ctx, &blob, printer2->datatype);
+				break;
+			case REG_IDX_DEVMODE:
+				break;
+			case REG_IDX_SECDESC:
+				break;		
+			default:
+				/* unsupported value...throw away */
+				DEBUG(8,("convert_values_to_printer_info_2: Unsupported registry value [%s]\n", 
+					regval_name( val ) ));
+		}
+	}
+	
+	return;
+}	
+
 /**********************************************************************
  *********************************************************************/
 
 static bool key_printers_store_values(const char *key, struct regval_ctr *values)
 {
-	TALLOC_CTX *ctx = talloc_tos();
 	char *printers_key;
+	char *printername, *keyname;
+	NT_PRINTER_INFO_LEVEL   *printer = NULL;
+	WERROR result;
+	TALLOC_CTX *mem_ctx = talloc_init("key_printers_store_values");
+	
+	printers_key = strip_printers_prefix( key );
+	
+	/* values in the top level key get stored in the registry */
 
-	printers_key = create_printer_registry_path(ctx, key);
-	if (printers_key == NULL) {
+	if ( !printers_key ) {
 		/* normalize on the 'HKLM\SOFTWARE\....\Print\Printers' key */
-		return regdb_store_values(KEY_WINNT_PRINTERS, values);
+		return regdb_store_values( KEY_WINNT_PRINTERS, values );
+	}
+	
+	if (!reg_split_path( printers_key, &printername, &keyname )) {
+		return False;
+	}
+
+	if ( !W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, printername) ) )
+		return False;
+
+	/* deal with setting values directly under the printername */
+
+	if ( !keyname ) {
+		convert_values_to_printer_info_2(mem_ctx, printer->info_2, values );
+	}
+	else {
+		int num_values = regval_ctr_numvals( values );
+		int i;
+		struct regval_blob *val;
+		
+		delete_printer_key( printer->info_2->data, keyname );
+		
+		/* deal with any subkeys */
+		for ( i=0; i<num_values; i++ ) {
+			val = regval_ctr_specific_value( values, i );
+			result = set_printer_dataex( printer, keyname, 
+				regval_name( val ),
+				regval_type( val ),
+				regval_data_p( val ),
+				regval_size( val ) );
+			if ( !W_ERROR_IS_OK(result) ) {
+				DEBUG(0,("key_printers_store_values: failed to set printer data [%s]!\n",
+					keyname));
+				free_a_printer( &printer, 2 );
+				talloc_destroy(mem_ctx);
+				return False;
+			}
+		}
 	}
 
-	return regdb_store_values(printers_key, values);
+	result = mod_a_printer( printer, 2 );
+
+	free_a_printer( &printer, 2 );
+	talloc_destroy(mem_ctx);
+
+	return W_ERROR_IS_OK(result);
+}
+
+/*********************************************************************
+ *********************************************************************
+ ** "HKLM/SYSTEM/CURRENTCONTROLSET/CONTROL/PRINT/ENVIRONMENTS"
+ *********************************************************************
+ *********************************************************************/
+
+static int key_driver_fetch_keys( const char *key, struct regsubkey_ctr *subkeys )
+{
+	const char *environments[] = {
+		"Windows 4.0",
+		"Windows NT x86",
+		"Windows NT R4000",
+		"Windows NT Alpha_AXP",
+		"Windows NT PowerPC",
+		"Windows IA64",
+		"Windows x64",
+		NULL };
+	fstring *drivers = NULL;
+	int i, env_index, num_drivers;
+	char *keystr, *base, *subkeypath;
+	char *key2 = NULL;
+	int num_subkeys = -1;
+	int version;
+	TALLOC_CTX *ctx = talloc_tos();
+
+	DEBUG(10,("key_driver_fetch_keys key=>[%s]\n", key ? key : "NULL" ));
+
+	keystr = reg_remaining_path(ctx, key + strlen(KEY_ENVIRONMENTS) );
+
+	/* list all possible architectures */
+
+	if ( !keystr ) {
+		for ( num_subkeys=0; environments[num_subkeys]; num_subkeys++ )
+			regsubkey_ctr_addkey( subkeys, 	environments[num_subkeys] );
+
+		return num_subkeys;
+	}
+
+	/* we are dealing with a subkey of "Environments */
+	key2 = talloc_strdup(ctx, keystr);
+	if (!key2) {
+		return -1;
+	}
+	keystr = key2;
+	if (!reg_split_path(keystr, &base, &subkeypath )) {
+		return -1;
+	}
+
+	/* sanity check */
+
+	for ( env_index=0; environments[env_index]; env_index++ ) {
+		if ( strequal( environments[env_index], base ) )
+			break;
+	}
+	if ( !environments[env_index] )
+		return -1;
+
+	/* ...\Print\Environements\...\ */
+
+	if ( !subkeypath ) {
+		regsubkey_ctr_addkey( subkeys, "Drivers" );
+		regsubkey_ctr_addkey( subkeys, "Print Processors" );
+
+		return 2;
+	}
+
+	/* more of the key path to process */
+
+	keystr = subkeypath;
+	if (!reg_split_path( keystr, &base, &subkeypath )) {
+		return -1;
+	}
+
+	/* ...\Print\Environements\...\Drivers\ */
+
+	if ( !subkeypath ) {
+		if ( strequal(base, "Drivers") ) {
+			switch ( env_index ) {
+				case 0:	/* Win9x */
+					regsubkey_ctr_addkey( subkeys, "Version-0" );
+					break;
+				default: /* Windows NT based systems */
+					regsubkey_ctr_addkey( subkeys, "Version-2" );
+					regsubkey_ctr_addkey( subkeys, "Version-3" );
+					break;
+			}
+
+			return regsubkey_ctr_numkeys( subkeys );
+		} else if ( strequal(base, "Print Processors") ) {
+			if ( env_index == 1 || env_index == 5 || env_index == 6 )
+
+
+			return regsubkey_ctr_numkeys( subkeys );
+		} else
+			return -1;	/* bad path */
+	}
+
+	/* we finally get to enumerate the drivers */
+
+	/* only one possible subkey below PrintProc key */
+
+	if ( strequal(base, "Print Processors") ) {
+		keystr = subkeypath;
+		if (!reg_split_path( keystr, &base, &subkeypath )) {
+			return -1;
+		}
+
+		/* no subkeys below this point */
+
+		if ( subkeypath )
+			return -1;
+
+		/* only allow one keyname here -- 'winprint' */
+
+		return strequal( base, "winprint" ) ? 0 : -1;
+	}
+
+	/* only dealing with drivers from here on out */
+
+	keystr = subkeypath;
+	if (!reg_split_path( keystr, &base, &subkeypath )) {
+		return -1;
+	}
+
+	version = atoi(&base[strlen(base)-1]);
+
+	switch (env_index) {
+	case 0:
+		if ( version != 0 )
+			return -1;
+		break;
+	default:
+		if ( version != 2 && version != 3 )
+			return -1;
+		break;
+	}
+
+
+	if ( !subkeypath ) {
+		num_drivers = get_ntdrivers( &drivers, environments[env_index], version );
+		for ( i=0; i<num_drivers; i++ )
+			regsubkey_ctr_addkey( subkeys, drivers[i] );
+
+		return regsubkey_ctr_numkeys( subkeys );
+	}
+
+	/* if anything else left, just say if has no subkeys */
+
+	DEBUG(1,("key_driver_fetch_keys unhandled key [%s] (subkey == %s)\n",
+		key, subkeypath ));
+
+	return 0;
+}
+
+
+/**********************************************************************
+ *********************************************************************/
+
+static void fill_in_driver_values(const struct spoolss_DriverInfo8 *r,
+				  struct regval_ctr *values)
+{
+	char *buffer = NULL;
+	int buffer_size = 0;
+	int i, length;
+	const char *filename;
+	DATA_BLOB data;
+
+	filename = dos_basename(r->driver_path);
+	regval_ctr_addvalue_sz(values, "Driver", filename);
+
+	filename = dos_basename(r->config_file);
+	regval_ctr_addvalue_sz(values, "Configuration File", filename);
+
+	filename = dos_basename(r->data_file);
+	regval_ctr_addvalue_sz(values, "Data File", filename);
+
+	filename = dos_basename(r->help_file);
+	regval_ctr_addvalue_sz(values, "Help File", filename);
+
+	regval_ctr_addvalue_sz(values, "Data Type", r->default_datatype);
+
+	regval_ctr_addvalue( values, "Version", REG_DWORD, (char*)&r->version,
+		sizeof(r->version) );
+
+	if (r->dependent_files) {
+		/* place the list of dependent files in a single
+		   character buffer, separating each file name by
+		   a NULL */
+
+		for (i=0; r->dependent_files[i] && strcmp(r->dependent_files[i], ""); i++) {
+			/* strip the path to only the file's base name */
+
+			filename = dos_basename(r->dependent_files[i]);
+
+			length = strlen(filename);
+
+			buffer = (char *)SMB_REALLOC( buffer, buffer_size + (length + 1)*sizeof(uint16) );
+			if ( !buffer ) {
+				break;
+			}
+
+			push_reg_sz(talloc_tos(), &data, filename);
+			memcpy( buffer+buffer_size, (char*)data.data, data.length);
+
+			buffer_size += (length + 1)*sizeof(uint16);
+		}
+
+		/* terminated by double NULL.  Add the final one here */
+
+		buffer = (char *)SMB_REALLOC( buffer, buffer_size + 2 );
+		if ( !buffer ) {
+			buffer_size = 0;
+		} else {
+			buffer[buffer_size++] = '\0';
+			buffer[buffer_size++] = '\0';
+		}
+	}
+
+	regval_ctr_addvalue( values, "Dependent Files",    REG_MULTI_SZ, buffer, buffer_size );
+
+	SAFE_FREE( buffer );
+
+	return;
+}
+
+/**********************************************************************
+ *********************************************************************/
+
+static int driver_arch_fetch_values(char *key, struct regval_ctr *values)
+{
+	char 		*keystr, *base, *subkeypath;
+	fstring		arch_environment;
+	fstring		driver;
+	int		version;
+	struct spoolss_DriverInfo8 *driver_ctr;
+	WERROR		w_result;
+
+	if (!reg_split_path( key, &base, &subkeypath )) {
+		return -1;
+	}
+
+	/* no values in 'Environments\Drivers\Windows NT x86' */
+
+	if ( !subkeypath )
+		return 0;
+
+	/* We have the Architecture string and some subkey name:
+	   Currently we only support
+	   * Drivers
+	   * Print Processors
+	   Anything else is an error.
+	   */
+
+	fstrcpy( arch_environment, base );
+
+	keystr = subkeypath;
+	if (!reg_split_path( keystr, &base, &subkeypath )) {
+		return -1;
+	}
+
+	if ( strequal(base, "Print Processors") )
+		return 0;
+
+	/* only Drivers key can be left */
+
+	if ( !strequal(base, "Drivers") )
+		return -1;
+
+	if ( !subkeypath )
+		return 0;
+
+	/* We know that we have Architechure\Drivers with some subkey name
+	   The subkey name has to be Version-XX */
+
+	keystr = subkeypath;
+	if (!reg_split_path( keystr, &base, &subkeypath )) {
+		return -1;
+	}
+
+	if ( !subkeypath )
+		return 0;
+
+	version = atoi(&base[strlen(base)-1]);
+
+	/* BEGIN PRINTER DRIVER NAME BLOCK */
+
+	keystr = subkeypath;
+	if (!reg_split_path( keystr, &base, &subkeypath )) {
+		return -1;
+	}
+
+	/* don't go any deeper for now */
+
+	fstrcpy( driver, base );
+
+	w_result = get_a_printer_driver(talloc_tos(), &driver_ctr, driver, arch_environment, version);
+
+	if ( !W_ERROR_IS_OK(w_result) )
+		return -1;
+
+	fill_in_driver_values(driver_ctr, values);
+
+	free_a_printer_driver(driver_ctr);
+
+	/* END PRINTER DRIVER NAME BLOCK */
+
+
+	DEBUG(8,("key_driver_fetch_values: Exit\n"));
+
+	return regval_ctr_numvals( values );
+}
+
+/**********************************************************************
+ *********************************************************************/
+
+static int key_driver_fetch_values(const char *key, struct regval_ctr *values)
+{
+	char *keystr = NULL;
+	char *subkey = NULL;
+	TALLOC_CTX *ctx = talloc_tos();
+
+	DEBUG(8,("key_driver_fetch_values: Enter key => [%s]\n", key ? key : "NULL"));
+
+	/* no values in the Environments key */
+
+	if (!(keystr = reg_remaining_path(ctx, key + strlen(KEY_ENVIRONMENTS))))
+		return 0;
+
+	subkey = talloc_strdup(ctx, keystr);
+	if (!subkey) {
+		return 0;
+	}
+
+	/* pass off to handle subkeys */
+
+	return driver_arch_fetch_values( subkey, values );
+}
+
+/*********************************************************************
+ *********************************************************************
+ ** "HKLM/SYSTEM/CURRENTCONTROLSET/CONTROL/PRINT"
+ *********************************************************************
+ *********************************************************************/
+
+static int key_print_fetch_keys( const char *key, struct regsubkey_ctr *subkeys )
+{
+	int key_len = strlen(key);
+
+	/* no keys below 'Print' handled here */
+
+	if ( (key_len != strlen(KEY_CONTROL_PRINT)) && (key_len != strlen(KEY_WINNT_PRINT)) )
+		return -1;
+
+	regsubkey_ctr_addkey( subkeys, "Environments" );
+	regsubkey_ctr_addkey( subkeys, "Monitors" );
+	regsubkey_ctr_addkey( subkeys, "Forms" );
+	regsubkey_ctr_addkey( subkeys, "Printers" );
+
+	return regsubkey_ctr_numkeys( subkeys );
 }
 
 /**********************************************************************
@@ -154,11 +1096,42 @@ static bool key_printers_store_values(const char *key, struct regval_ctr *values
  *********************************************************************/
 
 static struct reg_dyn_tree print_registry[] = {
+/* just pass the monitor onto the registry tdb */
+{ KEY_MONITORS,
+	&regdb_fetch_keys,
+	&regdb_store_keys,
+	&regdb_fetch_values,
+	&regdb_store_values },
+{ KEY_FORMS,
+	&key_forms_fetch_keys,
+	NULL,
+	&key_forms_fetch_values,
+	NULL },
 { KEY_CONTROL_PRINTERS,
 	&key_printers_fetch_keys,
 	&key_printers_store_keys,
 	&key_printers_fetch_values,
 	&key_printers_store_values },
+{ KEY_ENVIRONMENTS,
+	&key_driver_fetch_keys,
+	NULL,
+	&key_driver_fetch_values,
+	NULL },
+{ KEY_CONTROL_PRINT,
+	&key_print_fetch_keys,
+	NULL,
+	NULL,
+	NULL },
+{ KEY_WINNT_PRINTERS,
+	&key_printers_fetch_keys,
+	&key_printers_store_keys,
+	&key_printers_fetch_values,
+	&key_printers_store_values },
+{ KEY_PORTS,
+	&regdb_fetch_keys,
+	&regdb_store_keys,
+	&regdb_fetch_values,
+	&regdb_store_values },
 
 { NULL, NULL, NULL, NULL, NULL }
 };
diff --git a/source3/registry/reg_backend_prod_options.c b/source3/registry/reg_backend_prod_options.c
index 655c587ac4..786bc99eb1 100644
--- a/source3/registry/reg_backend_prod_options.c
+++ b/source3/registry/reg_backend_prod_options.c
@@ -25,8 +25,6 @@
  */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_backend_shares.c b/source3/registry/reg_backend_shares.c
index 3113f0f84c..1977406049 100644
--- a/source3/registry/reg_backend_shares.c
+++ b/source3/registry/reg_backend_shares.c
@@ -20,17 +20,15 @@
 /* Implementation of registry virtual views for printing information */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 /**********************************************************************
- It is safe to assume that every registry path passed into one of
- the exported functions here begins with KEY_SHARES else
+ It is safe to assume that every registry path passed into on of 
+ the exported functions here begins with KEY_PRINTING else
  these functions would have never been called.  This is a small utility
- function to strip the beginning of the path and make a copy that the
+ function to strip the beginning of the path and make a copy that the 
  caller can modify.  Note that the caller is responsible for releasing
  the memory allocated here.
  **********************************************************************/
@@ -39,23 +37,24 @@ static char* trim_reg_path( const char *path )
 {
 	const char *p;
 	uint16 key_len = strlen(KEY_SHARES);
-
+	
 	/* 
 	 * sanity check...this really should never be True.
 	 * It is only here to prevent us from accessing outside
 	 * the path buffer in the extreme case.
 	 */
-
+	
 	if ( strlen(path) < key_len ) {
 		DEBUG(0,("trim_reg_path: Registry path too short! [%s]\n", path));
 		return NULL;
 	}
-
+	
+	
 	p = path + strlen( KEY_SHARES );
-
+	
 	if ( *p == '\\' )
 		p++;
-
+	
 	if ( *p )
 		return SMB_STRDUP(p);
 	else
@@ -66,22 +65,22 @@ static char* trim_reg_path( const char *path )
  Enumerate registry subkey names given a registry path.  
  Caller is responsible for freeing memory to **subkeys
  *********************************************************************/
-
+ 
 static int shares_subkey_info( const char *key, struct regsubkey_ctr *subkey_ctr )
 {
 	char 		*path;
 	bool		top_level = False;
 	int		num_subkeys = 0;
-
-	DEBUG(10, ("shares_subkey_info: key=>[%s]\n", key));
-
+	
+	DEBUG(10,("printing_subkey_info: key=>[%s]\n", key));
+	
 	path = trim_reg_path( key );
-
+	
 	/* check to see if we are dealing with the top level key */
-
+	
 	if ( !path )
 		top_level = True;
-
+		
 	if ( top_level ) {
 		num_subkeys = 1;
 		regsubkey_ctr_addkey( subkey_ctr, "Security" );
@@ -90,9 +89,9 @@ static int shares_subkey_info( const char *key, struct regsubkey_ctr *subkey_ctr
 	else
 		num_subkeys = handle_share_subpath( path, subkey_ctr, NULL );
 #endif
-
+	
 	SAFE_FREE( path );
-
+	
 	return num_subkeys;
 }
 
@@ -106,16 +105,16 @@ static int shares_value_info(const char *key, struct regval_ctr *val)
 	char 		*path;
 	bool		top_level = False;
 	int		num_values = 0;
-
-	DEBUG(10, ("shares_value_info: key=>[%s]\n", key));
-
+	
+	DEBUG(10,("printing_value_info: key=>[%s]\n", key));
+	
 	path = trim_reg_path( key );
-
+	
 	/* check to see if we are dealing with the top level key */
-
+	
 	if ( !path )
 		top_level = True;
-
+	
 	/* fill in values from the getprinterdata_printer_server() */
 	if ( top_level )
 		num_values = 0;
@@ -123,15 +122,15 @@ static int shares_value_info(const char *key, struct regval_ctr *val)
 	else
 		num_values = handle_printing_subpath( path, NULL, val );
 #endif
-
+		
 	SAFE_FREE(path);
-
+	
 	return num_values;
 }
 
 /**********************************************************************
  Stub function which always returns failure since we don't want
- people storing share information directly via registry calls
+ people storing printing information directly via regostry calls
  (for now at least)
  *********************************************************************/
 
@@ -142,7 +141,7 @@ static bool shares_store_subkey( const char *key, struct regsubkey_ctr *subkeys
 
 /**********************************************************************
  Stub function which always returns failure since we don't want
- people storing share information directly via registry calls
+ people storing printing information directly via regostry calls
  (for now at least)
  *********************************************************************/
 
diff --git a/source3/registry/reg_backend_smbconf.c b/source3/registry/reg_backend_smbconf.c
index 912f5eb1bf..15993438a9 100644
--- a/source3/registry/reg_backend_smbconf.c
+++ b/source3/registry/reg_backend_smbconf.c
@@ -19,8 +19,6 @@
  */
 
 #include "includes.h"
-#include "registry.h"
-#include "lib/privileges.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
@@ -59,9 +57,9 @@ static bool smbconf_store_values(const char *key, struct regval_ctr *val)
 
 static bool smbconf_reg_access_check(const char *keyname, uint32 requested,
 				     uint32 *granted,
-				     const struct security_token *token)
+				     const struct nt_user_token *token)
 {
-	if (!security_token_has_privilege(token, SEC_PRIV_DISK_OPERATOR)) {
+	if (!(user_has_privileges(token, &se_disk_operators))) {
 		return False;
 	}
 
diff --git a/source3/registry/reg_backend_tcpip_params.c b/source3/registry/reg_backend_tcpip_params.c
index dd132df093..fbad0436b6 100644
--- a/source3/registry/reg_backend_tcpip_params.c
+++ b/source3/registry/reg_backend_tcpip_params.c
@@ -25,8 +25,6 @@
  */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_cachehook.c b/source3/registry/reg_cachehook.c
index dc07b51944..4f84de5286 100644
--- a/source3/registry/reg_cachehook.c
+++ b/source3/registry/reg_cachehook.c
@@ -2,7 +2,6 @@
  *  Unix SMB/CIFS implementation.
  *  Virtual Windows Registry Layer
  *  Copyright (C) Gerald Carter                     2002.
- *  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
@@ -22,13 +21,11 @@
 
 #include "includes.h"
 #include "adt_tree.h"
-#include "registry.h"
-#include "reg_cachehook.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
-static struct sorted_tree *cache_tree = NULL;
+static SORTED_TREE *cache_tree = NULL;
 extern struct registry_ops regdb_ops;		/* these are the default */
 
 static WERROR keyname_to_path(TALLOC_CTX *mem_ctx, const char *keyname,
@@ -46,6 +43,12 @@ static WERROR keyname_to_path(TALLOC_CTX *mem_ctx, const char *keyname,
 		return WERR_NOMEM;
 	}
 
+	tmp_path = talloc_string_sub(mem_ctx, tmp_path, "\\", "/");
+	if (tmp_path == NULL) {
+		DEBUG(0, ("talloc_string_sub_failed!\n"));
+		return WERR_NOMEM;
+	}
+
 	*path = tmp_path;
 
 	return WERR_OK;
@@ -61,7 +64,7 @@ WERROR reghook_cache_init(void)
 		return WERR_OK;
 	}
 
-	cache_tree = pathtree_init(&regdb_ops);
+	cache_tree = pathtree_init(&regdb_ops, NULL);
 	if (cache_tree == NULL) {
 		return WERR_NOMEM;
 	}
@@ -73,7 +76,7 @@ WERROR reghook_cache_init(void)
 
 /**********************************************************************
  Add a new registry hook to the cache.  Note that the keyname
- is not in the exact format that a struct sorted_tree expects.
+ is not in the exact format that a SORTED_TREE expects.
  *********************************************************************/
 
 WERROR reghook_cache_add(const char *keyname, struct registry_ops *ops)
diff --git a/source3/registry/reg_cachehook.h b/source3/registry/reg_cachehook.h
deleted file mode 100644
index 7c901c0df4..0000000000
--- a/source3/registry/reg_cachehook.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  Virtual Windows Registry Layer
- *  Copyright (C) Gerald Carter                     2002.
- *  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/>.
- */
-
-#ifndef _REG_CACHEHOOK_H
-#define _REG_CACHEHOOK_H
-
-WERROR reghook_cache_init(void);
-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 );
-
-#endif /* _REG_CACHEHOOK_H */
diff --git a/source3/registry/reg_db.h b/source3/registry/reg_db.h
deleted file mode 100644
index 774093d2b3..0000000000
--- a/source3/registry/reg_db.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 
-   Parameters for Samba's Internal Registry Database
-   
-   Copyright (C) Michael Adam 2007
-   
-   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/>.
-*/
-
-#ifndef _REG_DB_H
-#define _REG_DB_H
-
-#define REG_TDB_FLAGS   TDB_SEQNUM
-
-#define REGVER_V1       1       /* first db version with write support */
-#define REGVER_V2       2       /* version 2 with normalized keys */
-
-#define REG_VALUE_PREFIX    "SAMBA_REGVAL"
-#define REG_SECDESC_PREFIX  "SAMBA_SECDESC"
-#define REG_SORTED_SUBKEYS_PREFIX  "SAMBA_SORTED_SUBKEYS"
-
-#endif /* _REG_DB_H */
diff --git a/source3/registry/reg_dispatcher.c b/source3/registry/reg_dispatcher.c
index a96047817d..cc6d95f738 100644
--- a/source3/registry/reg_dispatcher.c
+++ b/source3/registry/reg_dispatcher.c
@@ -24,9 +24,6 @@
  */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_dispatcher.h"
-#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
@@ -37,12 +34,12 @@ static const struct generic_mapping reg_generic_map =
 /********************************************************************
 ********************************************************************/
 
-static WERROR construct_registry_sd(TALLOC_CTX *ctx, struct security_descriptor **psd)
+static WERROR construct_registry_sd(TALLOC_CTX *ctx, SEC_DESC **psd)
 {
-	struct security_ace ace[3];
+	SEC_ACE ace[3];
 	size_t i = 0;
-	struct security_descriptor *sd;
-	struct security_acl *theacl;
+	SEC_DESC *sd;
+	SEC_ACL *theacl;
 	size_t sd_size;
 
 	/* basic access for Everyone */
@@ -67,7 +64,7 @@ static WERROR construct_registry_sd(TALLOC_CTX *ctx, struct security_descriptor
 		return WERR_NOMEM;
 	}
 
-	sd = make_sec_desc(ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE,
+	sd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE,
 			   &global_sid_Builtin_Administrators,
 			   &global_sid_System, NULL, theacl,
 			   &sd_size);
@@ -162,18 +159,12 @@ int fetch_reg_values(struct registry_key_handle *key, struct regval_ctr *val)
 
 bool regkey_access_check(struct registry_key_handle *key, uint32 requested,
 			 uint32 *granted,
-			 const struct security_token *token )
+			 const struct nt_user_token *token )
 {
-	struct security_descriptor *sec_desc;
+	SEC_DESC *sec_desc;
 	NTSTATUS status;
 	WERROR err;
 
-	/* root free-pass, like we have on all other pipes like samr, lsa, etc. */
-	if (geteuid() == sec_initial_uid()) {
-		*granted = REG_KEY_ALL;
-		return true;
-	}
-
 	/* use the default security check if the backend has not defined its
 	 * own */
 
diff --git a/source3/registry/reg_dispatcher.h b/source3/registry/reg_dispatcher.h
deleted file mode 100644
index c80ba15ec1..0000000000
--- a/source3/registry/reg_dispatcher.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *  Virtual Windows Registry Layer
- *  Copyright (C) Gerald Carter                     2002-2005
- *  Copyright (C) Michael Adam                      2006-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/>.
- */
-
-#ifndef _REG_DISPATCHER_H
-#define _REG_DISPATCHER_H
-
-bool store_reg_keys(struct registry_key_handle *key,
-		    struct regsubkey_ctr *subkeys);
-bool store_reg_values(struct registry_key_handle *key, struct regval_ctr *val);
-WERROR create_reg_subkey(struct registry_key_handle *key, const char *subkey);
-WERROR delete_reg_subkey(struct registry_key_handle *key, const char *subkey);
-int fetch_reg_keys(struct registry_key_handle *key,
-		   struct regsubkey_ctr *subkey_ctr);
-int fetch_reg_values(struct registry_key_handle *key, struct regval_ctr *val);
-bool regkey_access_check(struct registry_key_handle *key, uint32 requested,
-			 uint32 *granted,
-			 const struct security_token *token);
-WERROR regkey_get_secdesc(TALLOC_CTX *mem_ctx, struct registry_key_handle *key,
-			  struct security_descriptor **psecdesc);
-WERROR regkey_set_secdesc(struct registry_key_handle *key,
-			  struct security_descriptor *psecdesc);
-bool reg_subkeys_need_update(struct registry_key_handle *key,
-			     struct regsubkey_ctr *subkeys);
-bool reg_values_need_update(struct registry_key_handle *key,
-			    struct regval_ctr *values);
-
-#endif /* _REG_DISPATCHER_H */
diff --git a/source3/registry/reg_eventlog.c b/source3/registry/reg_eventlog.c
new file mode 100644
index 0000000000..722cd58f69
--- /dev/null
+++ b/source3/registry/reg_eventlog.c
@@ -0,0 +1,377 @@
+
+/* 
+ *  Unix SMB/CIFS implementation.
+ *  Virtual Windows Registry Layer
+ *  Copyright (C) Marcin Krzysztof Porwit    2005,
+ *  Copyright (C) Brian Moran                2005.
+ *  Copyright (C) Gerald (Jerry) Carter      2005.
+ *  
+ *  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/>.
+ */
+
+#include "includes.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_REGISTRY
+
+/**********************************************************************
+ for an eventlog, add in the default values
+*********************************************************************/
+
+bool eventlog_init_keys(void)
+{
+	/* Find all of the eventlogs, add keys for each of them */
+	const char **elogs = lp_eventlog_list();
+	char *evtlogpath = NULL;
+	char *evtfilepath = NULL;
+	struct regsubkey_ctr *subkeys;
+	struct regval_ctr *values;
+	uint32 uiMaxSize;
+	uint32 uiRetention;
+	uint32 uiCategoryCount;
+	DATA_BLOB data;
+	TALLOC_CTX *ctx = talloc_tos();
+	WERROR werr;
+
+	while (elogs && *elogs) {
+		werr = regsubkey_ctr_init(ctx, &subkeys);
+		if (!W_ERROR_IS_OK(werr)) {
+			DEBUG( 0, ( "talloc() failure!\n" ) );
+			return False;
+		}
+		regdb_fetch_keys(KEY_EVENTLOG, subkeys);
+		regsubkey_ctr_addkey( subkeys, *elogs );
+		if ( !regdb_store_keys( KEY_EVENTLOG, subkeys ) ) {
+			TALLOC_FREE(subkeys);
+			return False;
+		}
+		TALLOC_FREE(subkeys);
+
+		/* add in the key of form KEY_EVENTLOG/Application */
+		DEBUG( 5,
+		       ( "Adding key of [%s] to path of [%s]\n", *elogs,
+			 KEY_EVENTLOG ) );
+
+		evtlogpath = talloc_asprintf(ctx, "%s\\%s",
+			  KEY_EVENTLOG, *elogs);
+		if (!evtlogpath) {
+			return false;
+		}
+		/* add in the key of form KEY_EVENTLOG/Application/Application */
+		DEBUG( 5,
+		       ( "Adding key of [%s] to path of [%s]\n", *elogs,
+			 evtlogpath ) );
+		werr = regsubkey_ctr_init(ctx, &subkeys);
+		if (!W_ERROR_IS_OK(werr)) {
+			DEBUG( 0, ( "talloc() failure!\n" ) );
+			return False;
+		}
+		regdb_fetch_keys( evtlogpath, subkeys );
+		regsubkey_ctr_addkey( subkeys, *elogs );
+
+		if ( !regdb_store_keys( evtlogpath, subkeys ) ) {
+			TALLOC_FREE(subkeys);
+			return False;
+		}
+		TALLOC_FREE( subkeys );
+
+		/* now add the values to the KEY_EVENTLOG/Application form key */
+		if (!(values = TALLOC_ZERO_P(ctx, struct regval_ctr))) {
+			DEBUG( 0, ( "talloc() failure!\n" ) );
+			return False;
+		}
+		DEBUG( 5,
+		       ( "Storing values to eventlog path of [%s]\n",
+			 evtlogpath ) );
+		regdb_fetch_values( evtlogpath, values );
+
+
+		if (!regval_ctr_key_exists(values, "MaxSize")) {
+
+			/* assume we have none, add them all */
+
+			/* hard code some initial values */
+
+			/* uiDisplayNameId = 0x00000100; */
+			uiMaxSize = 0x00080000;
+			uiRetention = 0x93A80;
+
+			regval_ctr_addvalue(values, "MaxSize", REG_DWORD,
+					     (char *)&uiMaxSize,
+					     sizeof(uint32));
+
+			regval_ctr_addvalue(values, "Retention", REG_DWORD,
+					     (char *)&uiRetention,
+					     sizeof(uint32));
+
+			regval_ctr_addvalue_sz(values, "PrimaryModule", *elogs);
+			push_reg_sz(talloc_tos(), &data, *elogs);
+
+			regval_ctr_addvalue(values, "Sources", REG_MULTI_SZ,
+					     (char *)data.data,
+					     data.length);
+
+			evtfilepath = talloc_asprintf(ctx,
+					"%%SystemRoot%%\\system32\\config\\%s.tdb",
+					*elogs);
+			if (!evtfilepath) {
+				TALLOC_FREE(values);
+			}
+			push_reg_sz(talloc_tos(), &data, evtfilepath);
+			regval_ctr_addvalue(values, "File", REG_EXPAND_SZ, (char *)data.data,
+					     data.length);
+			regdb_store_values(evtlogpath, values);
+
+		}
+
+		TALLOC_FREE(values);
+
+		/* now do the values under KEY_EVENTLOG/Application/Application */
+		TALLOC_FREE(evtlogpath);
+		evtlogpath = talloc_asprintf(ctx, "%s\\%s\\%s",
+			  KEY_EVENTLOG, *elogs, *elogs);
+		if (!evtlogpath) {
+			return false;
+		}
+		if (!(values = TALLOC_ZERO_P(ctx, struct regval_ctr))) {
+			DEBUG( 0, ( "talloc() failure!\n" ) );
+			return False;
+		}
+		DEBUG( 5,
+		       ( "Storing values to eventlog path of [%s]\n",
+			 evtlogpath));
+		regdb_fetch_values(evtlogpath, values);
+		if (!regval_ctr_key_exists( values, "CategoryCount")) {
+
+			/* hard code some initial values */
+
+			uiCategoryCount = 0x00000007;
+			regval_ctr_addvalue( values, "CategoryCount",
+					     REG_DWORD,
+					     ( char * ) &uiCategoryCount,
+					     sizeof( uint32 ) );
+			push_reg_sz(talloc_tos(), &data,
+				      "%SystemRoot%\\system32\\eventlog.dll");
+
+			regval_ctr_addvalue( values, "CategoryMessageFile",
+					     REG_EXPAND_SZ,
+					     ( char * ) data.data,
+					     data.length);
+			regdb_store_values( evtlogpath, values );
+		}
+		TALLOC_FREE(values);
+		elogs++;
+	}
+
+	return true;
+}
+
+/*********************************************************************
+ for an eventlog, add in a source name. If the eventlog doesn't
+ exist (not in the list) do nothing.   If a source for the log
+ already exists, change the information (remove, replace)
+*********************************************************************/
+
+bool eventlog_add_source( const char *eventlog, const char *sourcename,
+			  const char *messagefile )
+{
+	/* Find all of the eventlogs, add keys for each of them */
+	/* need to add to the value KEY_EVENTLOG/<eventlog>/Sources string (Creating if necessary)
+	   need to add KEY of source to KEY_EVENTLOG/<eventlog>/<source> */
+
+	const char **elogs = lp_eventlog_list(  );
+	const char **wrklist, **wp;
+	char *evtlogpath = NULL;
+	struct regsubkey_ctr *subkeys;
+	struct regval_ctr *values;
+	struct regval_blob *rval;
+	int ii = 0;
+	bool already_in;
+	int i;
+	int numsources = 0;
+	TALLOC_CTX *ctx = talloc_tos();
+	WERROR werr;
+	DATA_BLOB blob;
+
+	if (!elogs) {
+		return False;
+	}
+
+	for ( i = 0; elogs[i]; i++ ) {
+		if ( strequal( elogs[i], eventlog ) )
+			break;
+	}
+
+	if ( !elogs[i] ) {
+		DEBUG( 0,
+		       ( "Eventlog [%s] not found in list of valid event logs\n",
+			 eventlog ) );
+		return false;	/* invalid named passed in */
+	}
+
+	/* have to assume that the evenlog key itself exists at this point */
+	/* add in a key of [sourcename] under the eventlog key */
+
+	/* todo add to Sources */
+
+	if (!( values = TALLOC_ZERO_P(ctx, struct regval_ctr))) {
+		DEBUG( 0, ( "talloc() failure!\n" ));
+		return false;
+	}
+
+	evtlogpath = talloc_asprintf(ctx, "%s\\%s", KEY_EVENTLOG, eventlog);
+	if (!evtlogpath) {
+		TALLOC_FREE(values);
+		return false;
+	}
+
+	regdb_fetch_values( evtlogpath, values );
+
+
+	if ( !( rval = regval_ctr_getvalue( values, "Sources" ) ) ) {
+		DEBUG( 0, ( "No Sources value for [%s]!\n", eventlog ) );
+		return False;
+	}
+	/* perhaps this adding a new string to a multi_sz should be a fn? */
+	/* check to see if it's there already */
+
+	if ( rval->type != REG_MULTI_SZ ) {
+		DEBUG( 0,
+		       ( "Wrong type for Sources, should be REG_MULTI_SZ\n" ) );
+		return False;
+	}
+	/* convert to a 'regulah' chars to do some comparisons */
+
+	already_in = False;
+	wrklist = NULL;
+	dump_data( 1, rval->data_p, rval->size );
+
+	blob = data_blob_const(rval->data_p, rval->size);
+	if (!pull_reg_multi_sz(talloc_tos(), &blob, &wrklist)) {
+		return false;
+	}
+
+	for (ii=0; wrklist[ii]; ii++) {
+		numsources++;
+	}
+
+	if (numsources > 0) {
+		/* see if it's in there already */
+		wp = wrklist;
+
+		while (wp && *wp ) {
+			if ( strequal( *wp, sourcename ) ) {
+				DEBUG( 5,
+				       ( "Source name [%s] already in list for [%s] \n",
+					 sourcename, eventlog ) );
+				already_in = True;
+				break;
+			}
+			wp++;
+		}
+	} else {
+		DEBUG( 3,
+		       ( "Nothing in the sources list, this might be a problem\n" ) );
+	}
+
+	wp = wrklist;
+
+	if ( !already_in ) {
+		/* make a new list with an additional entry; copy values, add another */
+		wp = TALLOC_ARRAY(ctx, const char *, numsources + 2 );
+
+		if ( !wp ) {
+			DEBUG( 0, ( "talloc() failed \n" ) );
+			return False;
+		}
+		memcpy( wp, wrklist, sizeof( char * ) * numsources );
+		*( wp + numsources ) = ( char * ) sourcename;
+		*( wp + numsources + 1 ) = NULL;
+		if (!push_reg_multi_sz(ctx, &blob, wp)) {
+			return false;
+		}
+		dump_data( 1, blob.data, blob.length);
+		regval_ctr_addvalue( values, "Sources", REG_MULTI_SZ,
+				     ( char * ) blob.data, blob.length);
+		regdb_store_values( evtlogpath, values );
+		data_blob_free(&blob);
+	} else {
+		DEBUG( 3,
+		       ( "Source name [%s] found in existing list of sources\n",
+			 sourcename ) );
+	}
+	TALLOC_FREE(values);
+	TALLOC_FREE(wrklist);	/*  */
+
+	werr = regsubkey_ctr_init(ctx, &subkeys);
+	if (!W_ERROR_IS_OK(werr)) {
+		DEBUG( 0, ( "talloc() failure!\n" ) );
+		return False;
+	}
+	TALLOC_FREE(evtlogpath);
+	evtlogpath = talloc_asprintf(ctx, "%s\\%s", KEY_EVENTLOG, eventlog );
+	if (!evtlogpath) {
+		TALLOC_FREE(subkeys);
+		return false;
+	}
+
+	regdb_fetch_keys( evtlogpath, subkeys );
+
+	if ( !regsubkey_ctr_key_exists( subkeys, sourcename ) ) {
+		DEBUG( 5,
+		       ( " Source name [%s] for eventlog [%s] didn't exist, adding \n",
+			 sourcename, eventlog ) );
+		regsubkey_ctr_addkey( subkeys, sourcename );
+		if ( !regdb_store_keys( evtlogpath, subkeys ) )
+			return False;
+	}
+	TALLOC_FREE(subkeys);
+
+	/* at this point KEY_EVENTLOG/<eventlog>/<sourcename> key is in there. Now need to add EventMessageFile */
+
+	/* now allocate room for the source's subkeys */
+
+	werr = regsubkey_ctr_init(ctx, &subkeys);
+	if (!W_ERROR_IS_OK(werr)) {
+		DEBUG( 0, ( "talloc() failure!\n" ) );
+		return False;
+	}
+	TALLOC_FREE(evtlogpath);
+	evtlogpath = talloc_asprintf(ctx, "%s\\%s\\%s",
+		  KEY_EVENTLOG, eventlog, sourcename);
+	if (!evtlogpath) {
+		TALLOC_FREE(subkeys);
+		return false;
+	}
+
+	regdb_fetch_keys( evtlogpath, subkeys );
+
+	/* now add the values to the KEY_EVENTLOG/Application form key */
+	if ( !( values = TALLOC_ZERO_P(ctx, struct regval_ctr ) ) ) {
+		DEBUG( 0, ( "talloc() failure!\n" ) );
+		return False;
+	}
+	DEBUG( 5,
+	       ( "Storing EventMessageFile [%s] to eventlog path of [%s]\n",
+		 messagefile, evtlogpath ) );
+
+	regdb_fetch_values( evtlogpath, values );
+
+	regval_ctr_addvalue_sz(values, "EventMessageFile", messagefile);
+	regdb_store_values( evtlogpath, values );
+
+	TALLOC_FREE(values);
+
+	return True;
+}
diff --git a/source3/registry/reg_format.c b/source3/registry/reg_format.c
deleted file mode 100644
index f2b0846b11..0000000000
--- a/source3/registry/reg_format.c
+++ /dev/null
@@ -1,808 +0,0 @@
-/*
- * Samba Unix/Linux SMB client library
- *
- * Copyright (C) Gregor Beck 2010
- *
- * 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/>.
- */
-
-/**
- * @brief  Format dot.reg files
- * @file   reg_format.c
- * @author Gregor Beck <gb@sernet.de>
- * @date   Sep 2010
- */
-
-#include "reg_format.h"
-#include "reg_parse.h"
-#include "reg_parse_internal.h"
-#include "cbuf.h"
-#include "srprs.h"
-#include "registry.h"
-#include "registry/reg_objects.h"
-#include <assert.h>
-
-static void cstr_unescape(char* val)
-{
-	all_string_sub(val, "\\r", "\r", 0);
-	all_string_sub(val, "\\n", "\n", 0);
-	all_string_sub(val, "\\t", "\t", 0);
-	all_string_sub(val, "\\\\", "\\", 0);
-}
-
-/******************************************************************************/
-
-/**
- * Print value assign to stream.
- *
- * @param[out] ost outstream
- * @param[in]  name string
- *
- * @return numner of bytes written, -1 on error
- * @see srprs_val_name
- */
-static int cbuf_print_value_assign(cbuf* ost, const char* name) {
-	int ret, n;
-	if (*name == '\0') {
-		ret = cbuf_putc(ost, '@');
-	} else {
-		ret = cbuf_print_quoted_string(ost, name);
-	}
-
-	if (ret<0) {
-		return ret;
-	}
-
-	n = cbuf_putc(ost, '=');
-	if (n < 0) {
-		return n;
-	}
-	ret += n;
-
-	return ret;
-}
-
-enum fmt_hive {
-	FMT_HIVE_PRESERVE=0,
-	FMT_HIVE_SHORT,
-	FMT_HIVE_LONG
-};
-
-
-struct fmt_key {
-	enum fmt_hive hive_fmt;
-	enum fmt_case hive_case;
-	enum fmt_case key_case;
-	const char*   sep;
-};
-
-
-static int
-cbuf_print_hive(cbuf* ost, const char* hive, int len, const struct fmt_key* fmt)
-{
-	if (fmt->hive_fmt != FMT_HIVE_PRESERVE) {
-		const struct hive_info* hinfo = hive_info(hive, len);
-		if (hinfo == NULL) {
-			DEBUG(0, ("Unknown hive %*s", len, hive));
-		} else {
-			switch(fmt->hive_fmt) {
-			case FMT_HIVE_SHORT:
-				hive = hinfo->short_name;
-				len  = hinfo->short_name_len;
-				break;
-			case FMT_HIVE_LONG:
-				hive = hinfo->long_name;
-				len  = hinfo->long_name_len;
-				break;
-			default:
-				DEBUG(0, ("Unsupported hive format %d",
-					  (int)fmt->hive_fmt));
-				return -1;
-			}
-		}
-	}
-
-	return cbuf_puts_case(ost, hive, len, fmt->hive_case);
-}
-
-static int
-cbuf_print_keyname(cbuf* ost, const char* key[], int n, const struct fmt_key* fmt)
-{
-	int r, ret=0;
-	size_t pos = cbuf_getpos(ost);
-	bool hive = true;
-
-	for (; n>0; key++, n--) {
-		const char* start = *key;
-		while(*start != '\0') {
-			const char* end = start;
-			while(*end != '\\' && *end != '\0') {
-				end++;
-			}
-
-			if (hive) {
-				r = cbuf_print_hive(ost, start, end-start, fmt);
-				if (r < 0) {
-					goto fail;
-				}
-
-				ret += r;
-				hive = false;
-			} else {
-				r = cbuf_puts(ost, fmt->sep, -1);
-				if (r < 0) {
-					goto fail;
-				}
-				ret += r;
-
-				r = cbuf_puts_case(ost, start, end-start, fmt->key_case);
-				if (r < 0) {
-					goto fail;
-				}
-				ret += r;
-			}
-
-			while(*end == '\\') {
-				end++;
-			}
-			start = end;
-		}
-	}
-	return ret;
-fail:
-	cbuf_setpos(ost, pos);
-	return r;
-}
-/**@}*/
-
-/**
- * @defgroup reg_format Format dot.reg file.
- * @{
- */
-
-struct reg_format
-{
-	struct reg_parse_callback reg_parse_callback;
-	struct reg_format_callback call;
-	unsigned flags;
-	smb_iconv_t fromUTF16;
-	const char* sep;
-};
-
-int reg_format_value_delete(struct reg_format* f, const char* name)
-{
-	int ret;
-	cbuf* line = cbuf_new(f);
-
-	ret = cbuf_print_value_assign(line, name);
-	if (ret < 0) {
-		goto done;
-	}
-
-	ret = cbuf_putc(line, '-');
-	if (ret < 0 ) {
-		goto done;
-	}
-
-	ret = f->call.writeline(f->call.data, cbuf_gets(line, 0));
-done:
-	talloc_free(line);
-	return ret;
-}
-
-/* Todo: write hex if str contains CR or LF */
-static int
-reg_format_value_sz(struct reg_format* f, const char* name, const char* str)
-{
-	int ret;
-	cbuf* line = cbuf_new(f);
-
-	ret = cbuf_print_value_assign(line, name);
-	if (ret < 0) {
-		goto done;
-	}
-
-	ret = cbuf_print_quoted_string(line, str);
-	if (ret < 0) {
-		goto done;
-	}
-
-	ret = f->call.writeline(f->call.data, cbuf_gets(line, 0));
-
-done:
-	talloc_free(line);
-	return ret;
-}
-
-static int reg_format_value_dw(struct reg_format* f, const char* name, uint32_t dw)
-{
-	int ret;
-	cbuf* line = cbuf_new(f);
-
-	ret = cbuf_print_value_assign(line, name);
-	if (ret < 0) {
-		goto done;
-	}
-
-	ret = cbuf_printf(line, "dword:%08x", dw);
-	if (ret < 0) {
-		goto done;
-	}
-
-	ret = f->call.writeline(f->call.data, cbuf_gets(line, 0));
-done:
-	talloc_free(line);
-	return ret;
-}
-
-static int reg_format_value_hex(struct reg_format* f, const char* name, uint32_t type,
-				const void* data, size_t len)
-{
-	int n;
-	int cpl=0;
-	int ret=0;
-	const unsigned char* ptr;
-
-	cbuf* line = cbuf_new(f);
-
-	n = cbuf_print_value_assign(line, name);
-	if (n < 0) {
-		ret = n;
-		goto done;
-	}
-
-	cpl += n;
-
-	if (type==REG_BINARY && !(f->flags & REG_FMT_HEX_BIN)) {
-		n=cbuf_puts(line, "hex:", -1);
-	} else {
-		n=cbuf_printf(line, "hex(%x):", type);
-	}
-	if (n < 0) {
-		ret = n;
-		goto done;
-	}
-
-	cpl += n;
-
-	for (ptr=(const unsigned char *)data; len>1; len--,ptr++) {
-		n = cbuf_printf(line, "%02x,", (unsigned)(*ptr));
-		if (n < 0) {
-			return n;
-		}
-		cpl += n;
-
-		if ( cpl > 76 ) {
-			n = cbuf_putc(line, '\\');
-			if (n< 0) {
-				return n;
-			}
-
-			n = f->call.writeline(f->call.data, cbuf_gets(line,0));
-			if (n < 0) {
-				ret = n;
-				goto done;
-			}
-			ret += n;
-
-			cbuf_clear(line);
-			cpl = cbuf_puts(line, "  ", -1);
-			if (cpl < 0) {
-				ret = cpl;
-				goto done;
-			}
-		}
-	}
-
-	if ( len > 0 ) {
-		n = cbuf_printf(line, "%02x", (unsigned)(*ptr));
-		if (n < 0) {
-			ret = n;
-			goto done;
-		}
-		cpl += n;
-	}
-
-	n = f->call.writeline(f->call.data, cbuf_gets(line,0));
-	if (n < 0) {
-		ret = n;
-		goto done;
-	}
-	ret += n;
-done:
-	talloc_free(line);
-	return ret;
-}
-
-int reg_format_value(struct reg_format* f, const char* name, uint32_t type,
-		     const uint8_t* data, size_t len)
-{
-	int ret = 0;
-	void* mem_ctx = talloc_new(f);
-
-	switch (type) {
-	case REG_SZ:
-		if (!(f->flags & REG_FMT_HEX_SZ)) {
-			char* str = NULL;
-			size_t dlen;
-			if (pull_ucs2_talloc(mem_ctx, &str, (const smb_ucs2_t*)data, &dlen)) {
-				ret = reg_format_value_sz(f, name, str);
-				goto done;
-			} else {
-				DEBUG(0, ("reg_format_value %s: "
-					  "pull_ucs2_talloc failed"
-					  ", try to write hex\n", name));
-			}
-		}
-		break;
-
-	case REG_DWORD:
-		if (!(f->flags & REG_FMT_HEX_SZ) && (len == sizeof(uint32_t))) {
-			uint32_t dw = IVAL(data,0);
-			ret = reg_format_value_dw(f, name, dw);
-			goto done;
-		}
-		break;
-
-	case REG_MULTI_SZ:
-	case REG_EXPAND_SZ:
-		if (f->fromUTF16 && (f->fromUTF16 != ((smb_iconv_t)-1))) {
-			char* str = NULL;
-			size_t dlen = iconvert_talloc(mem_ctx, f->fromUTF16,
-						      (const char*)data, len, &str);
-			if (dlen != -1) {
-				ret = reg_format_value_hex(f, name, type, str, dlen);
-				goto done;
-			} else {
-				DEBUG(0, ("reg_format_value %s: "
-					  "iconvert_talloc failed"
-					  ", try to write hex\n", name));
-			}
-		}
-		break;
-	default:
-		break;
-	}
-
-	ret = reg_format_value_hex(f, name, type, data, len);
-done:
-	talloc_free(mem_ctx);
-	return ret;
-}
-
-
-int reg_format_comment(struct reg_format* f, const char* txt)
-{
-	int ret;
-	cbuf* line = cbuf_new(f);
-
-	ret = cbuf_putc(line,';');
-	if (ret<0) {
-		goto done;
-	}
-
-	ret = cbuf_puts(line, txt, -1);
-	if (ret < 0) {
-		goto done;
-	}
-
-	ret = f->call.writeline(f->call.data, cbuf_gets(line, 0));
-done:
-	talloc_free(line);
-	return ret;
-}
-
-
-/******************************************************************************/
-
-
-
-struct reg_format* reg_format_new(const void* talloc_ctx,
-				  struct reg_format_callback cb,
-				  const char* str_enc, unsigned flags,
-				  const char* sep)
-{
-	static const struct reg_parse_callback reg_parse_callback_default = {
-		.key = (reg_parse_callback_key_t)&reg_format_key,
-		.val = (reg_parse_callback_val_t)&reg_format_value,
-		.val_del = (reg_parse_callback_val_del_t)&reg_format_value_delete,
-		.comment = (reg_parse_callback_comment_t)&reg_format_comment,
-	};
-
-	struct reg_format* f = talloc_zero(talloc_ctx, struct reg_format);
-	if (f == NULL) {
-		return NULL;
-	}
-
-	f->reg_parse_callback = reg_parse_callback_default;
-	f->reg_parse_callback.data = f;
-
-	f->call = cb;
-	f->flags = flags;
-	f->sep   = sep;
-
-	if (str_enc && !set_iconv(&f->fromUTF16, str_enc, "UTF-16LE")) {
-		DEBUG(0, ("reg_format_new: failed to set encoding: %s\n",
-			  str_enc));
-		goto fail;
-	}
-
-	assert(&f->reg_parse_callback == (struct reg_parse_callback*)f);
-	return f;
-fail:
-	talloc_free(f);
-	return NULL;
-}
-
-int reg_format_set_options(struct reg_format* fmt, const char* options)
-{
-	static const char* DEFAULT ="enc=unix,flags=0,sep=\\";
-
-	int ret = 0;
-	char *key, *val;
-	void* ctx = talloc_new(fmt);
-
-	if (options == NULL) {
-		options = DEFAULT;
-	}
-
-	while (srprs_option(&options, ctx, &key, &val)) {
-		if ((strcmp(key, "enc") == 0) || (strcmp(key, "strenc") == 0)) {
-			if (!set_iconv(&fmt->fromUTF16, val, "UTF-16LE")) {
-				DEBUG(0, ("Failed to set encoding: %s\n", val));
-				ret = -1;
-			}
-		} else if ((strcmp(key, "flags") == 0) && (val != NULL)) {
-			char* end = NULL;
-			if (val != NULL) {
-				fmt->flags = strtol(val, &end, 0);
-			}
-			if ((end==NULL) || (*end != '\0')) {
-				DEBUG(0, ("Invalid flags format: %s\n",
-					  val ? val : "<NULL>"));
-				ret = -1;
-			}
-		} else if ((strcmp(key, "sep") == 0) && (val != NULL)) {
-			cstr_unescape(val);
-			fmt->sep = talloc_steal(fmt, val);
-		}
-
-		/* else if (strcmp(key, "hive") == 0) { */
-		/* 	if (strcmp(val, "short") == 0) { */
-		/* 		f->hive_fmt = REG_FMT_SHORT_HIVES; */
-		/* 	} else if (strcmp(val, "long") == 0) { */
-		/* 		f->hive_fmt = REG_FMT_LONG_HIVES; */
-		/* 	} else if (strcmp(val, "preserve") == 0) { */
-		/* 		f->hive_fmt = REG_FMT_PRESERVE_HIVES; */
-		/* 	} else { */
-		/* 		DEBUG(0, ("Invalid hive format: %s\n", val)); */
-		/* 		ret = -1; */
-		/* 	} */
-		/* } */
-	}
-	talloc_free(ctx);
-	return ret;
-}
-
-int reg_format_key(struct reg_format* f, const char* key[], size_t n, bool del)
-{
-	int ret, r;
-	cbuf* line = cbuf_new(f);
-	struct fmt_key key_fmt = {
-		.key_case  = (f->flags >>  4) & 0x0F,
-		.hive_case = (f->flags >>  8) & 0x0F,
-		.hive_fmt  = (f->flags >> 12) & 0x0F,
-		.sep       = f->sep,
-	};
-
-	ret = cbuf_putc(line, '[');
-	if (ret < 0) {
-		goto done;
-	}
-
-	if (del) {
-		ret = cbuf_putc(line, '-');
-		if (ret < 0) {
-			goto done;
-		}
-	}
-
-	ret = cbuf_print_keyname(line, key, n, &key_fmt);
-	if (ret < 0) {
-		goto done;
-	}
-
-	ret = cbuf_putc(line, ']');
-	if (ret < 0) {
-		goto done;
-	}
-
-	ret = f->call.writeline(f->call.data, "");
-	if (ret < 0) {
-		goto done;
-	}
-
-	r = f->call.writeline(f->call.data, cbuf_gets(line, 0));
-	if (r < 0) {
-		ret = r;
-		goto done;
-	}
-	ret += r;
-
-done:
-	talloc_free(line);
-	return ret;
-}
-
-
-int reg_format_registry_key(struct reg_format* f, struct registry_key* key,
-			    bool del)
-{
-	return reg_format_key(f, (const char**)&key->key->name, 1, del);
-}
-
-int reg_format_registry_value(struct reg_format* f, const char* name,
-			      struct registry_value* val)
-{
-	return reg_format_value(f, name, val->type,
-				val->data.data, val->data.length);
-}
-
-int reg_format_regval_blob(struct reg_format* f, const char* name,
-			   struct regval_blob* val)
-{
-
-	return reg_format_value(f,
-				name ? name : regval_name(val),
-				regval_type(val),
-				regval_data_p(val),
-				regval_size(val));
-}
-
-/**@}*/
-
-
-struct reg_format_file
-{
-	FILE* file;
-	const char* encoding;
-	smb_iconv_t fromUnix;
-	char* nl;
-	size_t nl_len;
-};
-
-
-static int reg_format_file_close(struct reg_format* fmt)
-{
-	struct reg_format_file* fmt_ctx
-		= (struct reg_format_file*) fmt->call.data;
-	int ret = 0;
-	FILE* file = fmt_ctx->file;
-
-	if (fmt_ctx->encoding) {
-		char buf[32];
-		snprintf(buf, sizeof(buf), "coding: %s", fmt_ctx->encoding);
-		reg_format_comment(fmt, "Local Variables:");
-		reg_format_comment(fmt, buf);
-		reg_format_comment(fmt, "End:");
-	}
-
-	if (file != NULL) {
-		ret = fclose(file);
-	}
-
-	return ret;
-}
-
-static int reg_format_file_writeline(void* ptr, const char* line)
-{
-	size_t size;
-	char* dst=NULL;
-	struct reg_format_file* fmt_ctx = (struct reg_format_file*)ptr;
-	int ret, r;
-
-	size = iconvert_talloc(ptr, fmt_ctx->fromUnix, line, strlen(line), &dst);
-	if (size == -1 ) {
-		DEBUG(0, ("reg_format_file_writeline: iconvert_talloc failed >%s<\n",  line));
-		return -1;
-	}
-
-	ret = fwrite(dst, 1, size, fmt_ctx->file);
-	if (ret < 0) {
-		goto done;
-	}
-
-	r = fwrite(fmt_ctx->nl, 1, fmt_ctx->nl_len, fmt_ctx->file);
-	ret = (r < 0) ? r : ret + r;
-
-done:
-	talloc_free(dst);
-	return ret;
-}
-
-struct reg_format_file_opt {
-	const char* head;
-	const char* nl;
-	const char* enc;
-	bool bom;
-	const char* str_enc;
-	unsigned flags;
-	const char* sep;
-};
-
-static struct reg_format_file_opt reg_format_file_opt(void* mem_ctx, const char* opt)
-{
-	static const struct reg_format_file_opt REG4 = {
-		.head = "REGEDIT4",
-		.nl   = "\r\n",
-		.enc  = "dos",
-		.str_enc = "dos",
-		.bom  = false,
-		.flags = (FMT_HIVE_LONG << 12),
-		.sep   = "\\",
-	};
-
-	static const struct reg_format_file_opt REG5 = {
-		.head = "Windows Registry Editor Version 5.00",
-		.nl   = "\r\n",
-		.enc  = "UTF-16LE",
-		.str_enc = "UTF-16LE",
-		.bom  = true,
-		.flags = (FMT_HIVE_LONG << 12),
-		.sep   = "\\",
-	};
-
-	struct reg_format_file_opt ret = {
-		.head = REG5.head,
-		.nl   = "\n",
-		.enc  = "unix",
-		.bom  = false,
-		.str_enc = "UTF-16LE",
-		.flags = 0,
-		.sep   = "\\",
-	};
-
-	void* tmp_ctx = talloc_new(mem_ctx);
-
-	char *key, *val;
-
-	if (opt == NULL) {
-		goto done;
-	}
-
-	while(srprs_option(&opt, tmp_ctx, &key, &val)) {
-		if (strcmp(key, "enc") == 0) {
-			ret.enc     = talloc_steal(mem_ctx, val);
-			ret.str_enc = ret.enc;
-		} else if (strcmp(key, "strenc") == 0) {
-			ret.str_enc = talloc_steal(mem_ctx, val);
-		} else if (strcmp(key, "fileenc") == 0) {
-			ret.enc = talloc_steal(mem_ctx, val);
-		} else if ((strcmp(key, "flags") == 0) && (val != NULL)) {
-			char* end = NULL;
-			if (val != NULL) {
-				ret.flags = strtol(val, &end, 0);
-			}
-			if ((end==NULL) || (*end != '\0')) {
-				DEBUG(0, ("Invalid flags format: %s\n",
-					  val ? val : "<NULL>"));
-			}
-		} else if ((strcmp(key, "sep") == 0) && (val != NULL)) {
-			cstr_unescape(val);
-			ret.sep = talloc_steal(mem_ctx, val);
-		} else if (strcmp(key, "head") == 0) {
-			cstr_unescape(val);
-			ret.head = talloc_steal(mem_ctx, val);
-		} else if (strcmp(key, "nl") == 0) {
-			cstr_unescape(val);
-			ret.nl = talloc_steal(mem_ctx, val);
-		} else if (strcmp(key, "bom") == 0) {
-			if (val == NULL) {
-				ret.bom = true;
-			} else {
-				ret.bom = atoi(val);
-			}
-		} else if (strcmp(key, "regedit4") == 0) {
-			ret = REG4;
-		} else if (strcmp(key, "regedit5") == 0) {
-			ret = REG5;
-		}
-	}
-done:
-	talloc_free(tmp_ctx);
-	return ret;
-}
-
-
-struct reg_format* reg_format_file(const void* talloc_ctx,
-				   const char* filename,
-				   const char* options)
-{
-	struct reg_format_file* fmt_ctx;
-	struct reg_format* fmt;
-	int ret;
-	struct reg_format_file_opt opt;
-
-	struct reg_format_callback reg_format_cb = {
-		.writeline = &reg_format_file_writeline
-	};
-
-	fmt_ctx = talloc_zero(talloc_ctx, struct reg_format_file);
-	if (fmt_ctx == NULL) {
-		errno = ENOMEM;
-		return NULL;
-	}
-
-	opt = reg_format_file_opt(fmt_ctx, options);
-
-	reg_format_cb.data = fmt_ctx;
-
-	fmt = reg_format_new(talloc_ctx, reg_format_cb,
-			     opt.str_enc, opt.flags, opt.sep);
-	if (fmt == NULL) {
-		errno = ENOMEM;
-		talloc_free(fmt_ctx);
-		return NULL;
-	}
-
-	talloc_steal(fmt, fmt_ctx);
-
-	if (!set_iconv(&fmt->fromUTF16, opt.str_enc, "UTF-16LE")) { /* HACK */
-		DEBUG(0, ("reg_format_file: failed to set string encoding %s",
-			      opt.str_enc));
-		goto fail;
-	}
-
-	if (!set_iconv(&fmt_ctx->fromUnix, opt.enc, "unix")) {
-		DEBUG(0, ("reg_format_file: failed to set file encoding %s",
-			  opt.enc));
-		goto fail;
-	}
-	fmt_ctx->encoding = talloc_strdup(fmt_ctx, get_charset(opt.enc));
-
-	fmt_ctx->file = fopen(filename, "w");
-	if (fmt_ctx->file == NULL) {
-		DEBUG(0, ("reg_format_file: fopen failed: %s\n", strerror(errno)));
-		goto fail;
-	}
-
-	if (setvbuf(fmt_ctx->file, NULL, _IOFBF, 64000) < 0) {
-		DEBUG(0, ("reg_format_file: setvbuf failed: %s\n", strerror(errno)));
-	}
-
-	talloc_set_destructor(fmt, reg_format_file_close);
-
-	fmt_ctx->nl_len = iconvert_talloc(fmt, fmt_ctx->fromUnix, opt.nl, strlen(opt.nl), &fmt_ctx->nl);
-	if (fmt_ctx->nl_len == -1) {
-		DEBUG(0, ("iconvert_talloc failed\n"));
-		goto fail;
-	}
-
-	if (opt.bom) {
-		ret = write_bom(fmt_ctx->file, opt.enc, -1);
-		if (ret < 0) {
-			goto fail;
-		}
-	}
-
-	ret = fmt->call.writeline(fmt->call.data, opt.head);
-	if (ret < 0) {
-		goto fail;
-	}
-
-	return fmt;
-fail:
-	talloc_free(fmt);
-	return NULL;
-}
diff --git a/source3/registry/reg_format.h b/source3/registry/reg_format.h
deleted file mode 100644
index 5d0a4f2536..0000000000
--- a/source3/registry/reg_format.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Samba Unix/Linux SMB client library
- *
- * Copyright (C) Gregor Beck 2010
- *
- * 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/>.
- */
-
-/**
- * @brief  Format registration entries (.reg) files.
- * A formater is a talloced incarnation of an opaque struct reg_format.
- * It is fed with registry key's and value's and emits output by calling
- * writeline from its reg_format_callback.
- * @file   reg_format.h
- * @author Gregor Beck <gb@sernet.de>
- * @date   Sep 2010
- */
-#ifndef __REG_FORMAT_H
-#define __REG_FORMAT_H
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stddef.h>
-
-struct registry_key;
-struct registry_value;
-struct regval_blob;
-
-
-/**
- * A Formater for registration entries (.reg) files.
- *
- * It may be used as a reg_parse_callback, so the following is valid:
- * @code
- * reg_parse* p = reg_parse_new(mem_ctx,
- *                             (reg_parse_callback)reg_format_new(mem_ctx, cb, NULL, 0, "\\"),
- *                                NULL, 0);
- * @endcode
- * @see reg_parse
- */
-typedef struct reg_format reg_format;
-
-/**
- * Protoype for function called to output a line.
- *
- * @param private_data
- * @param line line to write in UNIX charset
- *
- * @return number of characters written, < 0 on error
- *
- * @see reg_parse
- */
-typedef int (*reg_format_callback_writeline_t)(void* private_data,
-					       const char* line);
-/**
- * Type handling the output of a reg_format object.
- * It containes the functions to call and an opaque data pointer.
- */
-typedef struct reg_format_callback {
-	/**< Function called to write a line */
-	reg_format_callback_writeline_t writeline;
-	void* data; /**< Private data passed to callback function */
-} reg_format_callback;
-
-/**
- * Create a new reg_format object.
- *
- * @param talloc_ctx the talloc parent
- * @param cb         the output handler
- * @param str_enc    the charset of hex encoded strings (REG_MULTI_SZ, REG_EXAND_SZ) if not UTF-16
- * @param flags
- * @param sep        the separator for subkeys
- *
- * @return a talloc'ed reg_format object, NULL on error
- */
-reg_format* reg_format_new(const void* talloc_ctx,
-			   reg_format_callback cb,
-			   const char* str_enc,
-			   unsigned flags,
-			   const char* sep);
-
-/**
- * Create a new reg_format object, writing to a file.
- *
- * @param talloc_ctx the talloc parent
- * @param filename   the file to write to
- * @param options
- *
- * @return a talloc'ed reg_format object, NULL on error
- */
-reg_format* reg_format_file(const void* talloc_ctx,
-			    const char* filename,
-			    const char* options);
-
-/**
- * Format a registry key given as struct registry_key.
- * Create/Open or Delete
- *
- * @param f   the formater.
- * @param key the key to output.
- * @param del wheter to format the deletion of the key
- *
- * @retval >= 0 on success.
- */
-int reg_format_registry_key(reg_format* f,
-			    struct registry_key* key,
-			    bool del);
-
-/**
- * Format a registry value given as struct registry_value.
- *
- * @param f    the formater.
- * @param name the values name
- * @param val  the values value.
- *
- * @retval >= 0 on success.
- */
-int reg_format_registry_value(reg_format* f,
-			      const char* name,
-			      struct registry_value* val);
-
-/**
- * Format a registry value given as struct regval_blob.
- *
- * @param f    the formater.
- * @param name the values name, if NULL use val->valname which is limited in size;
- * @param val  the values value.
- *
- * @retval >= 0 on success.
- */
-int reg_format_regval_blob(reg_format* f,
-			   const char* name,
-			   struct regval_blob* val);
-
-
-/**
- * Format deletion of a registry value.
- *
- * @param f    the formater.
- * @param name the values name
- *
- * @retval >= 0 on success.
- *
- * @see reg_parse_callback_val_del_t
- */
-int reg_format_value_delete(reg_format* f, const char* name);
-
-/**
- * Format a comment.
- *
- * @param f   the formater.
- * @param txt the comment in UNIX charset, may not contain newlines.
- *
- * @retval >= 0 on success.
- *
- * @see reg_parse_callback_comment_t
- */
-int reg_format_comment(reg_format* f, const char* txt);
-
-
-int reg_format_set_options(reg_format* f, const char* options);
-
-
-/* reg_format flags */
-#define REG_FMT_HEX_SZ  1
-#define REG_FMT_HEX_DW  2
-#define REG_FMT_HEX_BIN 4
-#define REG_FMT_HEX_ALL (REG_FMT_HEX_SZ | REG_FMT_HEX_DW | REG_FMT_HEX_BIN);
-#define REG_FMT_LONG_HIVES 16
-#define REG_FMT_SHORT_HIVES 32
-
-/* lowlevel */
-
-/**
- * Format a registry key.
- * Create/Open or Delete
- *
- * @param f   the formater
- * @param key the key to output
- * @param klen number of elements in key
- * @param del wheter to format the deletion of the key
- *
- * @retval >= 0 on success.
- *
- * @see reg_parse_callback_key_t
- */
-int reg_format_key(reg_format* f,
-		   const char* key[], size_t klen,
-		   bool del);
-
-/**
- * Format a registry value.
- *
- * @param f    the formater
- * @param name the values name
- * @param type the values type
- * @param data the values value
- * @param len  the number of bytes of data
- *
- * @retval >= 0 on success.
- *
- * @see reg_parse_callback_val_hex_t
- */
-int reg_format_value(reg_format* f,
-		     const char* name, uint32_t type,
-		     const uint8_t* data, size_t len);
-
-#endif /* __REG_FORMAT_H */
diff --git a/source3/registry/reg_import.c b/source3/registry/reg_import.c
deleted file mode 100644
index ce3cd9729f..0000000000
--- a/source3/registry/reg_import.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Samba Unix/Linux SMB client library
- * Adapter to use reg_parse with the registry api
- *
- * Copyright (C) Gregor Beck 2010
- *
- * 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/>.
- */
-
-#include "includes.h"
-#include "reg_parse.h"
-#include "reg_import.h"
-#include "registry.h"
-#include "registry/reg_objects.h"
-#include <assert.h>
-
-/* Debuglevel for tracing */
-static const int TL = 2;
-
-struct reg_import
-{
-	struct reg_parse_callback reg_parse_callback;
-	struct reg_import_callback call;
-	void* open_key;
-};
-
-static int
-reg_parse_callback_key(struct reg_import* cb_private,
-		       const char* key[], size_t n,
-		       bool del);
-
-static int
-reg_parse_callback_val(struct reg_import* cb_private,
-		       const char* name, uint32_t type,
-		       const uint8_t* data, uint32_t len);
-
-static int
-reg_parse_callback_val_registry_value(struct reg_import* cb_private,
-				      const char* name, uint32_t type,
-				      const uint8_t* data, uint32_t len);
-
-static int
-reg_parse_callback_val_regval_blob(struct reg_import* cb_private,
-				   const char* name, uint32_t type,
-				   const uint8_t* data, uint32_t len);
-
-static int
-reg_parse_callback_val_del(struct reg_import* cb_private,
-			   const char* name);
-
-static int
-reg_parse_callback_comment(struct reg_import* cb_private,
-			   const char* txt);
-
-
-/*******************************************************************************/
-
-int reg_parse_callback_key(struct reg_import* p,
-			   const char* key[], size_t n, bool del)
-{
-	WERROR werr = WERR_OK;
-
-	DEBUG(TL, ("%s: %s\n", __FUNCTION__, key[0]));
-
-	if (p->open_key != NULL ) {
-		werr = p->call.closekey(p->call.data, p->open_key);
-		if (!W_ERROR_IS_OK(werr)) {
-			DEBUG(0, ("closekey failed: %s\n", win_errstr(werr)));
-		}
-	}
-
-	if (del) {
-		werr = p->call.deletekey(p->call.data, NULL, key[0]);
-		if (W_ERROR_EQUAL(werr, WERR_BADFILE)) {
-			/* the key didn't exist, treat as success */
-			werr = WERR_OK;
-		}
-		if (!W_ERROR_IS_OK(werr)) {
-			DEBUG(0, ("deletekey %s failed: %s\n",
-				  key[0], win_errstr(werr)));
-		}
-	}
-	else {
-		bool existing;
-		werr = p->call.createkey(p->call.data, NULL, key[0],
-					 &p->open_key, &existing);
-		if (W_ERROR_IS_OK(werr)) {
-			DEBUG(TL, ("createkey %s %s\n",
-				  existing ? "opened" : "created", key[0]));
-		} else {
-			DEBUG(0, ("createkey %s failed: %s\n",
-				  key[0], win_errstr(werr)));
-		}
-	}
-
-	return W_ERROR_IS_OK(werr) ? 0 : -1;
-}
-
-#define DEBUG_ADD_HEX(LEV, PTR, LEN)					\
-	do {								\
-		int i;							\
-		const unsigned char* ptr = (const unsigned char*)PTR;	\
-		for (i=0; i<LEN; i++) {					\
-			DEBUGADD(LEV, ("'%c'(%02x)%s",			\
-				       isprint(ptr[i]) ? ptr[i] : '.',	\
-				       (unsigned)ptr[i],		\
-				       ((i+1 < LEN) && (i+1)%8)		\
-				       ? ",  " : "\n"));		\
-		}							\
-	} while(0)
-
-/*----------------------------------------------------------------------------*/
-int reg_parse_callback_val(struct reg_import* p,
-			   const char* name, uint32_t type,
-			   const uint8_t* data, uint32_t len)
-{
-	WERROR werr = WERR_OK;
-
-	DEBUG(TL, ("%s(%x): >%s< = [%x]\n",  __FUNCTION__, type, name, len));
-	DEBUG_ADD_HEX(TL, data, len);
-
-	werr = p->call.setval.blob(p->call.data, p->open_key, name, type,
-				   data, len);
-	if (!W_ERROR_IS_OK(werr)) {
-		DEBUG(0, ("setval %s failed: %s\n",
-			  name, win_errstr(werr)));
-	}
-
-	return W_ERROR_IS_OK(werr) ? 0 : -1;
-}
-
-/*----------------------------------------------------------------------------*/
-int reg_parse_callback_val_registry_value(struct reg_import* p,
-					  const char* name, uint32_t type,
-					  const uint8_t* data, uint32_t len)
-{
-	WERROR werr = WERR_OK;
-	struct registry_value val = {
-		.type = type,
-		.data = data_blob_talloc(p, data, len),
-	};
-
-	DEBUG(TL, ("%s(%x): >%s< = [%x]\n", __FUNCTION__, type, name, len));
-	DEBUG_ADD_HEX(TL, data, len);
-
-	werr = p->call.setval.registry_value(p->call.data, p->open_key,
-					     name, &val);
-	if (!W_ERROR_IS_OK(werr)) {
-		DEBUG(0, ("setval %s failed: %s\n",
-			  name, win_errstr(werr)));
-	}
-
-	data_blob_free(&val.data);
-	return W_ERROR_IS_OK(werr) ? 0 : -1;
-}
-
-/*----------------------------------------------------------------------------*/
-int reg_parse_callback_val_regval_blob(struct reg_import* p,
-				       const char* name, uint32_t type,
-				       const uint8_t* data, uint32_t len)
-{
-	WERROR werr = WERR_OK;
-	void* mem_ctx = talloc_new(p);
-	struct regval_blob* v = NULL;
-
-	DEBUG(TL, ("%s(%x): >%s< = [%x]\n", __FUNCTION__, type, name, len));
-	DEBUG_ADD_HEX(TL, data, len);
-
-	v = regval_compose(mem_ctx, name, type, data, len);
-	if (v == NULL) {
-		DEBUG(0, ("regval_compose %s failed\n", name));
-		werr = WERR_NOMEM;
-		goto done;
-	}
-
-	werr = p->call.setval.regval_blob(p->call.data, p->open_key, v);
-	if (!W_ERROR_IS_OK(werr)) {
-		DEBUG(0, ("setval %s failed: %s\n",
-			  name, win_errstr(werr)));
-	}
-
-done:
-	talloc_free(mem_ctx);
-
-	return W_ERROR_IS_OK(werr) ? 0 : -1;
-}
-
-
-/*----------------------------------------------------------------------------*/
-
-int reg_parse_callback_val_del(struct reg_import* p,
-			       const char* name)
-{
-	WERROR werr = WERR_OK;
-
-	DEBUG(TL, ("%s: %s\n", __FUNCTION__, name));
-
-	werr = p->call.deleteval(p->call.data, p->open_key, name);
-	if (!W_ERROR_IS_OK(werr)) {
-		DEBUG(0, ("deleteval %s failed: %s\n",
-			  name, win_errstr(werr)));
-	}
-
-	return W_ERROR_IS_OK(werr) ? 0 : -1;
-}
-
-
-int reg_parse_callback_comment(struct reg_import* cb_private,
-			       const char* txt)
-{
-	DEBUG(TL, ("%s: %s\n", __FUNCTION__, txt));
-	return 0;
-}
-
-/******************************************************************************/
-static int nop(void* data)
-{
-	return 0;
-}
-
-
-struct reg_parse_callback* reg_import_adapter(const void* talloc_ctx,
-					      struct reg_import_callback cb)
-{
-	struct reg_parse_callback* ret;
-	struct reg_import* p = talloc_zero(talloc_ctx, struct reg_import);
-	if (p == NULL) {
-		goto fail;
-	}
-	if (cb.openkey == NULL ) {
-		cb.openkey = (reg_import_callback_openkey_t)&nop;
-	}
-	if (cb.closekey == NULL ) {
-		cb.closekey = (reg_import_callback_closekey_t)&nop;
-	}
-	if (cb.createkey == NULL ) {
-		cb.createkey = (reg_import_callback_createkey_t)&nop;
-	}
-	if (cb.deletekey == NULL ) {
-		cb.deletekey = (reg_import_callback_deletekey_t)&nop;
-	}
-	if (cb.deleteval == NULL ) {
-		cb.deleteval = (reg_import_callback_deleteval_t)&nop;
-	}
-
-	p->call = cb;
-
-	ret = &p->reg_parse_callback;
-	ret->key     = (reg_parse_callback_key_t)     &reg_parse_callback_key;
-	ret->val_del = (reg_parse_callback_val_del_t) &reg_parse_callback_val_del;
-	ret->comment = (reg_parse_callback_comment_t) &reg_parse_callback_comment;
-	ret->data = p;
-
-	switch (cb.setval_type) {
-	case BLOB:
-		assert(cb.setval.blob != NULL);
-		ret->val = (reg_parse_callback_val_t) &reg_parse_callback_val;
-		break;
-	case REGISTRY_VALUE:
-		assert(cb.setval.registry_value != NULL);
-		ret->val = (reg_parse_callback_val_t) &reg_parse_callback_val_registry_value;
-		break;
-	case REGVAL_BLOB:
-		assert(cb.setval.regval_blob != NULL);
-		ret->val = (reg_parse_callback_val_t) &reg_parse_callback_val_regval_blob;
-		break;
-	case NONE:
-		ret->val = NULL;
-		break;
-	default:
-		assert(false);
-	}
-
-	assert((struct reg_parse_callback*)p == ret);
-	return ret;
-fail:
-	talloc_free(p);
-	return NULL;
-}
diff --git a/source3/registry/reg_import.h b/source3/registry/reg_import.h
deleted file mode 100644
index 5922f9d33b..0000000000
--- a/source3/registry/reg_import.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Samba Unix/Linux SMB client library
- *
- * Copyright (C) Gregor Beck 2010
- *
- * 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/>.
- */
-
-/**
- * @brief  Adapter to use reg_parse with the registry api
- * @file   reg_import.h
- * @author Gregor Beck <gb@sernet.de>
- * @date   Jun 2010
- */
-
-
-#ifndef REG_IMPORT_H
-#define REG_IMPORT_H
-
-#include "reg_parse.h"
-
-struct registry_value;
-struct regval_blob;
-
-/**
- * Protoype for function called to open a key.
- *
- * @param private_data
- * @param[in] parent    the parent of the key to open, may be NULL
- * @param[in] name      the name of the key relative to parent.
- * @param[out] key      the opened key
- *
- * @return WERR_OK on success
- */
-typedef	WERROR (*reg_import_callback_openkey_t) (void* private_data,
-						void* parent,
-						const char* name,
-						void** key);
-
-/**
- * Protoype for function called to close a key.
- *
- * @param private_data
- * @param key the key to close
- *
- * @return WERR_OK on success
- */
-typedef	WERROR (*reg_import_callback_closekey_t) (void* private_data,
-						  void* key);
-
-/**
- * Protoype for function called to create (or open an existing) key.
- *
- * @param private_data
- * @param[in] parent    the parent of the key to create, may be NULL
- * @param[in] name      the name of the key relative to parent.
- * @param[out] key      the opened key
- * @param[out] existing whether we opened an existing key
- *
- * @return WERR_OK on success
- */
-typedef	WERROR (*reg_import_callback_createkey_t)(void* private_data,
-						void* parent,
-						const char* name,
-						void** key,
-						bool* existing);
-
-/**
- * Protoype for function called to delete a key.
- *
- * @param private_data
- * @param parent    the parent of the key to delete, may be NULL
- * @param[in] name  the name of the key relative to parent.
- *
- * @return WERR_OK on success
- */
-typedef	WERROR (*reg_import_callback_deletekey_t)(void* private_data,
-						  void* parent,
-						  const char* name);
-
-/**
- * Protoype for function called to delete a value.
- *
- * @param private_data
- * @param parent    the key of the value to delete
- * @param[in] name  the name of the value to delete.
- *
- * @return WERR_OK on success
- */
-typedef	WERROR (*reg_import_callback_deleteval_t)(void* private_data,
-						void* parent,
-						const char* name);
-
-/**
- * Protoype for function called to set a value.
- *
- * @param private_data
- * @param parent the key of the value to set
- * @param name   the name of the value
- * @param type   the type of the value
- * @param data   the value of the value
- * @param size   the number of bytes of data
- *
- * @return WERR_OK on success
- */
-typedef	WERROR (*reg_import_callback_setval_blob_t)(void* private_data,
-						  void* parent,
-						  const char* name,
-						  uint32_t type,
-						  const uint8_t* data,
-						  uint32_t size);
-
-/**
- * Protoype for function called to set a value given as struct registry_value.
- *
- * @param private_data
- * @param parent the key of the value to set
- * @param name   the name of the value
- * @param val    the value of the value
- *
- * @return WERR_OK on success
- */
-typedef	WERROR (*reg_import_callback_setval_registry_value_t) (
-	void* private_data,
-	void* parent,
-	const char* name,
-	const struct registry_value* val);
-
-/**
- * Protoype for function called to set a value given as struct struct regval_blob.
- *
- * @param private_data
- * @param parent the key of the value to set
- * @param val    the value
- *
- * @return WERR_OK on success
- */
-typedef	WERROR (*reg_import_callback_setval_regval_blob_t)(
-	void* private_data,
-	void* parent,
-	const struct regval_blob* val);
-
-/**
- * Type handling the output of a reg_import object.
- * It containes the functions to call and an opaque data pointer.
- */
-struct reg_import_callback {
-	/** Function called to open key */
-	reg_import_callback_openkey_t   openkey;
-	/** Function called to close key */
-	reg_import_callback_closekey_t  closekey;
-	/** Function called to create or open key */
-	reg_import_callback_createkey_t createkey;
-	/** Function called to delete key */
-	reg_import_callback_deletekey_t deletekey;
-	/** Function called to delete value */
-	reg_import_callback_deleteval_t deleteval;
-
-	/** Function called to set value */
-	union {
-		reg_import_callback_setval_blob_t           blob;
-		reg_import_callback_setval_registry_value_t registry_value;
-		reg_import_callback_setval_regval_blob_t    regval_blob;
-	} setval;
-	/** Which function is called to set a value */
-	enum {
-		NONE=0,         /**< no setval function used */
-		BLOB,           /**< @ref reg_import_callback_setval_blob_t blob */
-		REGISTRY_VALUE, /**< @ref reg_import_callback_setval_registry_value_t registry_value */
-		REGVAL_BLOB,    /**< @ref reg_import_callback_setval_regval_blob_t regval_blob */
-	} setval_type;
-	void* data; /**< Private data passed to callback function */
-};
-
-
-/**
- * Create a new reg_import object.
- * Because its only purpose is to act as an reg_parse_callback the return type
- * is accordingly.
- *
- * @param talloc_ctx the talloc parent
- * @param cb         the output handler
- *
- * @return a talloc'ed reg_import object, NULL on error
- */
-struct reg_parse_callback* reg_import_adapter(const void* talloc_ctx,
-					      struct reg_import_callback cb);
-#endif
diff --git a/source3/registry/reg_init_basic.c b/source3/registry/reg_init_basic.c
index ea8077fc14..eab4ca7f9d 100644
--- a/source3/registry/reg_init_basic.c
+++ b/source3/registry/reg_init_basic.c
@@ -18,10 +18,6 @@
  */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_init_basic.h"
-#include "reg_cachehook.h"
-#include "reg_backend_db.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/registry/reg_init_basic.h b/source3/registry/reg_init_basic.h
deleted file mode 100644
index 4149b5d68a..0000000000
--- a/source3/registry/reg_init_basic.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Registry helper routines
- * 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/>.
- */
-
-#ifndef _REG_INIT_BASIC_H
-#define _REG_INIT_BASIC_H
-
-WERROR registry_init_common(void);
-WERROR registry_init_basic(void);
-
-#endif /* _REG_INIT_BASIC_H */
diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c
index b222d1392d..d05a74ef35 100644
--- a/source3/registry/reg_init_full.c
+++ b/source3/registry/reg_init_full.c
@@ -21,11 +21,6 @@
 /* Initialize the registry with all available backends. */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_cachehook.h"
-#include "reg_backend_db.h"
-#include "reg_init_basic.h"
-#include "reg_init_full.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
@@ -45,16 +40,11 @@ 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 */
 
-struct registry_hook {
-	const char	*keyname;	/* full path to name of key */
-	struct registry_ops	*ops;	/* registry function hooks */
-};
-
 struct registry_hook reg_hooks[] = {
 #ifndef REG_TDB_ONLY 
-  { KEY_PRINTING "\\Printers",	&printing_ops },
-  { KEY_PRINTING_2K, 		&regdb_ops },
-  { KEY_PRINTING_PORTS, 	&regdb_ops },
+  { KEY_PRINTING,    		&printing_ops },
+  { KEY_PRINTING_2K, 		&printing_ops },
+  { KEY_PRINTING_PORTS, 	&printing_ops },
   { KEY_SHARES,      		&shares_reg_ops },
   { KEY_SMBCONF,      		&smbconf_reg_ops },
   { KEY_NETLOGON_PARAMS,	&netlogon_params_reg_ops },
@@ -94,6 +84,12 @@ WERROR registry_init_full(void)
 	if ( DEBUGLEVEL >= 20 )
 		reghook_dump_cache(20);
 
+	/* add any keys for other services */
+
+	svcctl_init_keys();
+	eventlog_init_keys();
+	perfcount_init_keys();
+
 fail:
 	/* close and let each smbd open up as necessary */
 	regdb_close();
diff --git a/source3/registry/reg_init_full.h b/source3/registry/reg_init_full.h
deleted file mode 100644
index 8ba327e504..0000000000
--- a/source3/registry/reg_init_full.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- *
- * Registry helper routines
- *
- * Copyright (C) Michael Adam 2007
- * 
- * 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/>.
- */
-
-#ifndef _REG_INIT_FULL_H
-#define _REG_INIT_FULL_H
-
-WERROR registry_init_full(void);
-
-#endif /* _REG_INIT_FULL_H */
diff --git a/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c
index 18ee455bfd..28c4187784 100644
--- a/source3/registry/reg_init_smbconf.c
+++ b/source3/registry/reg_init_smbconf.c
@@ -18,11 +18,6 @@
  */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_cachehook.h"
-#include "reg_backend_db.h"
-#include "reg_init_basic.h"
-#include "reg_init_smbconf.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
@@ -30,6 +25,44 @@
 extern struct registry_ops smbconf_reg_ops;
 
 /*
+ * create a fake token just with enough rights to
+ * locally access the registry:
+ *
+ * - builtin administrators sid
+ * - disk operators privilege
+ */
+NTSTATUS registry_create_admin_token(TALLOC_CTX *mem_ctx,
+				     NT_USER_TOKEN **ptoken)
+{
+	NTSTATUS status;
+	NT_USER_TOKEN *token = NULL;
+
+	if (ptoken == NULL) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	token = TALLOC_ZERO_P(mem_ctx, NT_USER_TOKEN);
+	if (token == NULL) {
+		DEBUG(1, ("talloc failed\n"));
+		status = NT_STATUS_NO_MEMORY;
+		goto done;
+	}
+	token->privileges = se_disk_operators;
+	status = add_sid_to_array(token, &global_sid_Builtin_Administrators,
+				  &token->user_sids, &token->num_sids);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(1, ("Error adding builtin administrators sid "
+			  "to fake token.\n"));
+		goto done;
+	}
+
+	*ptoken = token;
+
+done:
+	return status;
+}
+
+/*
  * init the smbconf portion of the registry.
  * for use in places where not the whole registry is needed,
  * e.g. utils/net_conf.c and loadparm.c
diff --git a/source3/registry/reg_init_smbconf.h b/source3/registry/reg_init_smbconf.h
deleted file mode 100644
index 480d7af6c2..0000000000
--- a/source3/registry/reg_init_smbconf.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- *
- * Registry helper routines
- *
- * Copyright (C) Michael Adam 2007
- * 
- * 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/>.
- */
-
-#ifndef _REG_INIT_SMBCONF_H
-#define _REG_INIT_SMBCONF_H
-
-WERROR registry_init_smbconf(const char *keyname);
-
-#endif /* _REG_INIT_SMBCONF_H */
diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index 980986f95b..b4b8ff2630 100644
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -2,7 +2,6 @@
  *  Unix SMB/CIFS implementation.
  *  Virtual Windows Registry Layer
  *  Copyright (C) Gerald Carter                     2002-2005
- *  Copyright (C) Michael Adam                      2007-2010
  *
  *  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
@@ -21,33 +20,10 @@
 /* Implementation of registry frontend view functions. */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_objects.h"
-#include "util_tdb.h"
-#include "dbwrap.h"
-#include "../libcli/registry/util_reg.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
-/* low level structure to contain registry values */
-
-struct regval_blob {
-	fstring		valuename;
-	uint32_t	type;
-	/* this should be encapsulated in an RPC_DATA_BLOB */
-	uint32_t	size;	/* in bytes */
-	uint8_t		*data_p;
-};
-
-/* container for registry values */
-
-struct regval_ctr {
-	uint32_t num_values;
-	struct regval_blob **values;
-	int seqnum;
-};
-
 struct regsubkey_ctr {
 	uint32_t        num_subkeys;
 	char            **subkeys;
@@ -132,13 +108,13 @@ int regsubkey_ctr_get_seqnum(struct regsubkey_ctr *ctr)
 
 static WERROR regsubkey_ctr_hash_keyname(struct regsubkey_ctr *ctr,
 					 const char *keyname,
-					 uint32_t idx)
+					 uint32 idx)
 {
 	WERROR werr;
 
 	werr = ntstatus_to_werror(dbwrap_store_bystring_upper(ctr->subkeys_hash,
 						keyname,
-						make_tdb_data((uint8_t *)&idx,
+						make_tdb_data((uint8 *)&idx,
 							      sizeof(idx)),
 						TDB_REPLACE));
 	if (!W_ERROR_IS_OK(werr)) {
@@ -166,7 +142,7 @@ static WERROR regsubkey_ctr_unhash_keyname(struct regsubkey_ctr *ctr,
 
 static WERROR regsubkey_ctr_index_for_keyname(struct regsubkey_ctr *ctr,
 					      const char *keyname,
-					      uint32_t *idx)
+					      uint32 *idx)
 {
 	TDB_DATA data;
 
@@ -185,7 +161,7 @@ static WERROR regsubkey_ctr_index_for_keyname(struct regsubkey_ctr *ctr,
 	}
 
 	if (idx != NULL) {
-		*idx = *(uint32_t *)data.dptr;
+		*idx = *(uint32 *)data.dptr;
 	}
 
 	talloc_free(data.dptr);
@@ -241,7 +217,7 @@ WERROR regsubkey_ctr_addkey( struct regsubkey_ctr *ctr, const char *keyname )
 WERROR regsubkey_ctr_delkey( struct regsubkey_ctr *ctr, const char *keyname )
 {
 	WERROR werr;
-	uint32_t idx, j;
+	uint32 idx, j;
 
 	if (keyname == NULL) {
 		return WERR_INVALID_PARAM;
@@ -316,23 +292,6 @@ char* regsubkey_ctr_specific_key( struct regsubkey_ctr *ctr, uint32_t key_index
  * Utility functions for struct regval_ctr
  */
 
-/**
- * allocate a regval_ctr structure.
- */
-WERROR regval_ctr_init(TALLOC_CTX *mem_ctx, struct regval_ctr **ctr)
-{
-	if (ctr == NULL) {
-		return WERR_INVALID_PARAM;
-	}
-
-	*ctr = talloc_zero(mem_ctx, struct regval_ctr);
-	if (*ctr == NULL) {
-		return WERR_NOMEM;
-	}
-
-	return WERR_OK;
-}
-
 /***********************************************************************
  How many keys does the container hold ?
  **********************************************************************/
@@ -368,7 +327,7 @@ struct regval_blob* dup_registry_value(struct regval_blob *val)
 
 	if ( val->data_p && val->size )
 	{
-		if ( !(copy->data_p = (uint8_t *)memdup( val->data_p,
+		if ( !(copy->data_p = (uint8 *)memdup( val->data_p,
 						       val->size )) ) {
 			DEBUG(0,("dup_registry_value: memdup() failed for [%d] "
 				 "bytes!\n", val->size));
@@ -399,7 +358,7 @@ void free_registry_value(struct regval_blob *val)
 /**********************************************************************
  *********************************************************************/
 
-uint8_t* regval_data_p(struct regval_blob *val)
+uint8* regval_data_p(struct regval_blob *val)
 {
 	return val->data_p;
 }
@@ -407,7 +366,7 @@ uint8_t* regval_data_p(struct regval_blob *val)
 /**********************************************************************
  *********************************************************************/
 
-uint32_t regval_size(struct regval_blob *val)
+uint32 regval_size(struct regval_blob *val)
 {
 	return val->size;
 }
@@ -423,7 +382,7 @@ char* regval_name(struct regval_blob *val)
 /**********************************************************************
  *********************************************************************/
 
-uint32_t regval_type(struct regval_blob *val)
+uint32 regval_type(struct regval_blob *val)
 {
 	return val->type;
 }
@@ -434,7 +393,7 @@ uint32_t regval_type(struct regval_blob *val)
  **********************************************************************/
 
 struct regval_blob *regval_ctr_specific_value(struct regval_ctr *ctr,
-					      uint32_t idx)
+					      uint32 idx)
 {
 	if ( !(idx < ctr->num_values) )
 		return NULL;
@@ -463,8 +422,8 @@ bool regval_ctr_key_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)
+				   uint16 type,
+				   const char *data_p, size_t size)
 {
 	struct regval_blob *regval = TALLOC_P(ctx, struct regval_blob);
 
@@ -475,7 +434,7 @@ struct regval_blob *regval_compose(TALLOC_CTX *ctx, const char *name,
 	fstrcpy(regval->valuename, name);
 	regval->type = type;
 	if (size) {
-		regval->data_p = (uint8_t *)TALLOC_MEMDUP(regval, data_p, size);
+		regval->data_p = (uint8 *)TALLOC_MEMDUP(regval, data_p, size);
 		if (!regval->data_p) {
 			TALLOC_FREE(regval);
 			return NULL;
@@ -492,8 +451,8 @@ struct regval_blob *regval_compose(TALLOC_CTX *ctx, const char *name,
  Add a new registry value to the array
  **********************************************************************/
 
-int regval_ctr_addvalue(struct regval_ctr *ctr, const char *name, uint32_t type,
-                        const uint8_t *data_p, size_t size)
+int regval_ctr_addvalue(struct regval_ctr *ctr, const char *name, uint16 type,
+                        const char *data_p, size_t size)
 {
 	if ( !name )
 		return ctr->num_values;
@@ -543,7 +502,7 @@ int regval_ctr_addvalue_sz(struct regval_ctr *ctr, const char *name, const char
 	}
 
 	return regval_ctr_addvalue(ctr, name, REG_SZ,
-				   (const uint8_t *)blob.data,
+				   (const char *)blob.data,
 				   blob.length);
 }
 
@@ -560,7 +519,7 @@ int regval_ctr_addvalue_multi_sz(struct regval_ctr *ctr, const char *name, const
 	}
 
 	return regval_ctr_addvalue(ctr, name, REG_MULTI_SZ,
-				   (const uint8_t *)blob.data,
+				   (const char *)blob.data,
 				   blob.length);
 }
 
@@ -572,7 +531,7 @@ int regval_ctr_copyvalue(struct regval_ctr *ctr, struct regval_blob *val)
 {
 	if ( val ) {
 		regval_ctr_addvalue(ctr, val->valuename, val->type,
-				    (uint8_t *)val->data_p, val->size);
+				    (char *)val->data_p, val->size);
 	}
 
 	return ctr->num_values;
@@ -626,33 +585,13 @@ struct regval_blob* regval_ctr_getvalue(struct regval_ctr *ctr,
 	return NULL;
 }
 
-int regval_ctr_get_seqnum(struct regval_ctr *ctr)
-{
-	if (ctr == NULL) {
-		return -1;
-	}
-
-	return ctr->seqnum;
-}
-
-WERROR regval_ctr_set_seqnum(struct regval_ctr *ctr, int seqnum)
-{
-	if (ctr == NULL) {
-		return WERR_INVALID_PARAM;
-	}
-
-	ctr->seqnum = seqnum;
-
-	return WERR_OK;
-}
-
 /***********************************************************************
- return the data_p as a uint32_t
+ return the data_p as a uint32
  **********************************************************************/
 
-uint32_t regval_dword(struct regval_blob *val)
+uint32 regval_dword(struct regval_blob *val)
 {
-	uint32_t data;
+	uint32 data;
 
 	data = IVAL( regval_data_p(val), 0 );
 
diff --git a/source3/registry/reg_objects.h b/source3/registry/reg_objects.h
deleted file mode 100644
index a84bc8a80b..0000000000
--- a/source3/registry/reg_objects.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* 
-   Samba's Internal Registry objects
-   
-   SMB parameters and setup
-   Copyright (C) Gerald Carter                   2002-2006.
-   Copyright (C) Michael Adam                    2007-2010
-   
-   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/>.
-*/
-
-#ifndef _REG_OBJECTS_H /* _REG_OBJECTS_H */
-#define _REG_OBJECTS_H
-
-/* low level structure to contain registry values */
-
-struct regval_blob;
-
-/* container for registry values */
-
-struct regval_ctr;
-
-/* container for registry subkey names */
-
-struct regsubkey_ctr;
-
-/* The following definitions come from registry/reg_objects.c  */
-
-WERROR regsubkey_ctr_init(TALLOC_CTX *mem_ctx, struct regsubkey_ctr **ctr);
-WERROR regsubkey_ctr_reinit(struct regsubkey_ctr *ctr);
-WERROR regsubkey_ctr_set_seqnum(struct regsubkey_ctr *ctr, int seqnum);
-int regsubkey_ctr_get_seqnum(struct regsubkey_ctr *ctr);
-WERROR regsubkey_ctr_addkey( struct regsubkey_ctr *ctr, const char *keyname );
-WERROR regsubkey_ctr_delkey( struct regsubkey_ctr *ctr, const char *keyname );
-bool regsubkey_ctr_key_exists( struct regsubkey_ctr *ctr, const char *keyname );
-int regsubkey_ctr_numkeys( struct regsubkey_ctr *ctr );
-char* regsubkey_ctr_specific_key( struct regsubkey_ctr *ctr, uint32_t key_index );
-WERROR regval_ctr_init(TALLOC_CTX *mem_ctx, struct regval_ctr **ctr);
-int regval_ctr_numvals(struct regval_ctr *ctr);
-struct regval_blob* dup_registry_value(struct regval_blob *val);
-void free_registry_value(struct regval_blob *val);
-uint8_t* regval_data_p(struct regval_blob *val);
-uint32_t regval_size(struct regval_blob *val);
-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);
-struct regval_blob *regval_compose(TALLOC_CTX *ctx, const char *name,
-				   uint32_t type,
-				   const uint8_t *data_p, size_t size);
-int regval_ctr_addvalue(struct regval_ctr *ctr, const char *name, uint32_t type,
-			const uint8_t *data_p, size_t size);
-int regval_ctr_addvalue_sz(struct regval_ctr *ctr, const char *name, const char *data);
-int regval_ctr_addvalue_multi_sz(struct regval_ctr *ctr, const char *name, const char **data);
-int regval_ctr_copyvalue(struct regval_ctr *ctr, struct regval_blob *val);
-int regval_ctr_delvalue(struct regval_ctr *ctr, const char *name);
-struct regval_blob* regval_ctr_getvalue(struct regval_ctr *ctr,
-					const char *name);
-int regval_ctr_get_seqnum(struct regval_ctr *ctr);
-WERROR regval_ctr_set_seqnum(struct regval_ctr *ctr, int seqnum);
-uint32_t regval_dword(struct regval_blob *val);
-const char *regval_sz(struct regval_blob *val);
-
-
-#endif /* _REG_OBJECTS_H */
diff --git a/source3/registry/reg_parse.c b/source3/registry/reg_parse.c
deleted file mode 100644
index 908facabd1..0000000000
--- a/source3/registry/reg_parse.c
+++ /dev/null
@@ -1,960 +0,0 @@
-/*
- * Samba Unix/Linux SMB client library
- *
- * Copyright (C) Gregor Beck 2010
- *
- * 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/>.
- */
-
-/**
- * @brief  Parser for dot.reg files
- * @file   reg_parse.c
- * @author Gregor Beck <gb@sernet.de>
- * @date   Jun 2010
- *
- */
-
-#include "includes.h"
-#include "system/filesys.h"
-#include "cbuf.h"
-#include "srprs.h"
-#include "reg_parse_internal.h"
-#include "reg_parse.h"
-#include "reg_format.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <wchar.h>
-#include <talloc.h>
-#include <stdbool.h>
-#include <string.h>
-#include <sys/types.h>
-#include <regex.h>
-#include <assert.h>
-#include <stdint.h>
-
-enum reg_parse_state {
-	STATE_DEFAULT,
-	STATE_KEY_OPEN,
-	STATE_VAL_HEX_CONT,
-	STATE_VAL_SZ_CONT
-};
-
-struct reg_parse {
-	struct reg_format_callback reg_format_callback;
-	cbuf* key;
-	cbuf* valname;
-	uint32_t   valtype;
-	cbuf* valblob;
-	cbuf* tmp;
-	struct reg_parse_callback call;
-	int ret;
-	int linenum;
-	enum reg_parse_state state;
-	struct reg_parse_options* opt;
-	smb_iconv_t str2UTF16;
-	unsigned flags;
-};
-
-/**
- * @defgroup action Action
- * @{
- */
-static bool act_key(struct reg_parse* p, cbuf* keyname, bool del)
-{
-	const char* name = cbuf_gets(keyname, 0);
-	cbuf_swap(p->key, keyname);
-
-	assert(p->state == STATE_DEFAULT || p->state == STATE_KEY_OPEN);
-	p->state = del ? STATE_DEFAULT : STATE_KEY_OPEN;
-
-	assert(p->call.key);
-	p->ret = p->call.key(p->call.data, &name, 1, del);
-	return p->ret >= 0;
-}
-
-static bool value_callback(struct reg_parse* p)
-{
-	const char* name = cbuf_gets(p->valname,0);
-	const uint8_t* val = (const uint8_t*)cbuf_gets(p->valblob,0);
-	size_t len = cbuf_getpos(p->valblob);
-
-	assert(p->call.val);
-	p->ret = p->call.val(p->call.data, name, p->valtype, val, len);
-	return p->ret >= 0;
-}
-
-static bool act_val_hex(struct reg_parse* p, cbuf* value, bool cont)
-{
-	cbuf_swap(p->valblob, value);
-	assert((p->state == STATE_KEY_OPEN) || (p->state == STATE_VAL_HEX_CONT));
-
-	if (cont) {
-		p->state = STATE_VAL_HEX_CONT;
-	} else {
-		p->state = STATE_KEY_OPEN;
-
-		switch (p->valtype) {
-		case REG_EXPAND_SZ:
-		case REG_MULTI_SZ:
-			if (p->str2UTF16 != NULL) {
-				char* dst = NULL;
-				const char* src = cbuf_gets(p->valblob, 0);
-				const size_t slen = cbuf_getpos(p->valblob);
-				size_t dlen = iconvert_talloc(p,
-							      p->str2UTF16,
-							      src, slen,
-							      &dst);
-				if (dlen != -1) {
-					cbuf_swapptr(p->valblob, &dst, dlen);
-				} else {
-					DEBUG(0, ("iconvert_talloc failed\n"));
-				}
-				talloc_free(dst);
-			}
-		default:
-			break;
-		}
-		return value_callback(p);
-	}
-	return true;
-}
-
-static bool act_val_dw(struct reg_parse* p, uint32_t val)
-{
-	assert(p->valtype == REG_DWORD);
-	assert(p->state == STATE_KEY_OPEN);
-
-	cbuf_clear(p->valblob);
-
-	if (cbuf_putdw(p->valblob, val) < 0) {
-		return false;
-	}
-	return value_callback(p);
-}
-
-static bool act_val_sz(struct reg_parse* p, cbuf* value, bool cont)
-{
-	cbuf_swap(p->valblob, value);
-
-	assert(p->valtype == REG_SZ);
-	assert((p->state == STATE_KEY_OPEN) || (p->state == STATE_VAL_SZ_CONT));
-
-	if (cont) {
-		p->state = STATE_VAL_SZ_CONT;
-	} else {
-		char* dst = NULL;
-		size_t dlen;
-		const char* src = cbuf_gets(p->valblob, 0);
-
-		p->state = STATE_KEY_OPEN;
-
-
-		if (convert_string_talloc(p->valblob, CH_UNIX, CH_UTF16LE,
-					  src, strlen(src)+1,
-					  &dst, &dlen, true))
-		{
-			cbuf_swapptr(p->valblob, &dst, dlen);
-		} else {
-			DEBUG(0, ("convert_string_talloc failed: >%s<\n"
-				  "use it as is\t", src));
-		}
-		talloc_free(dst);
-
-		return value_callback(p);
-	}
-	return true;
-}
-
-static bool act_val_del(struct reg_parse* p)
-{
-	const char* name = cbuf_gets(p->valname, 0);
-
-	assert(p->call.val_del);
-	p->ret = p->call.val_del(p->call.data, name);
-	return p->ret >= 0;
-}
-
-static bool act_comment (struct reg_parse* p, const char* txt)
-{
-	assert(p->call.comment);
-	p->ret = p->call.comment(p->call.data, txt);
-	return p->ret >= 0;
-}
-/**@}*/
-
-
-static int nop(void* data)
-{
-	return 0;
-}
-
-
-struct reg_parse* reg_parse_new(const void* ctx,
-				struct reg_parse_callback cb,
-				const char* str_enc, unsigned flags)
-{
-	struct reg_parse* s = talloc_zero(ctx, struct reg_parse);
-	if (s == NULL)
-		return NULL;
-	s->key     = cbuf_new(s);
-	s->valname = cbuf_new(s);
-	s->valblob = cbuf_new(s);
-	s->tmp     = cbuf_new(s);
-	if ( (s->tmp == NULL) || (s->valblob == NULL)
-	     || (s->valname == NULL) || (s->key == NULL) )
-	{
-		goto fail;
-	}
-
-	s->reg_format_callback.writeline = (reg_format_callback_writeline_t)&reg_parse_line;
-	s->reg_format_callback.data      = s;
-
-	s->valtype = 0;
-	if (cb.key == NULL) {
-		cb.key = (reg_parse_callback_key_t)&nop;
-	}
-	if (cb.val == NULL) {
-		cb.val = (reg_parse_callback_val_t)&nop;
-	}
-	if (cb.val_del == NULL) {
-		cb.val_del = (reg_parse_callback_val_del_t)&nop;
-	}
-	if (cb.comment == NULL) {
-		cb.comment = (reg_parse_callback_comment_t)&nop;
-	}
-
-	s->call = cb;
-	s->linenum = 0;
-	s->state = STATE_DEFAULT;
-	s->flags = flags;
-
-	if (str_enc && !set_iconv(&s->str2UTF16, "UTF-16LE", str_enc)) {
-		DEBUG(0, ("reg_parse_new: failed to set encoding: %s",
-			  str_enc));
-		goto fail;
-	}
-
-	assert(&s->reg_format_callback == (struct reg_format_callback*)s);
-	return s;
-fail:
-	talloc_free(s);
-	return NULL;
-}
-
-/**
- * @defgroup parse Parser Primitive
- * @ingroup internal
- * @{
- */
-
-
-static bool srprs_key(const char** ptr, cbuf* key, bool* del)
-{
-	const char* pos = *ptr;
-	const char* closing_bracket_pos = NULL;
-	size_t      closing_bracket_idx = 0;
-
-	if (!srprs_skipws(&pos) || !srprs_char(&pos, '[')) {
-		return false;
-	}
-
-	*del = srprs_char(&pos, '-');
-
-	cbuf_clear(key);
-
-	while (true) {
-		while (srprs_charsetinv(&pos, "]\\", key))
-			;
-
-		switch (*pos) {
-
-		case ']':
-			closing_bracket_idx = cbuf_getpos(key);
-			closing_bracket_pos = pos;
-			cbuf_putc(key, ']');
-			pos++;
-			break;
-
-		case '\\':
-			cbuf_putc(key, '\\');
-			/* n++; */
-			/* cbuf_puts(subkeyidx, cbuf_getpos(key), sizeof(size_t)) */
-			while (srprs_char(&pos,'\\'))
-				;
-			break;
-
-		case '\0':
-			if (closing_bracket_pos == NULL) {
-				return false;
-			}
-
-			/* remove trailing backslash (if any) */
-			if (*(closing_bracket_pos-1)=='\\') {
-				closing_bracket_idx--;
-			}
-
-			cbuf_setpos(key, closing_bracket_idx);
-			*ptr = closing_bracket_pos+1;
-			return true;
-
-		default:
-			assert(false);
-		}
-	}
-}
-
-static bool srprs_val_name(const char** ptr, cbuf* name)
-{
-	const char* pos = *ptr;
-	const size_t spos = cbuf_getpos(name);
-
-	if ( !srprs_skipws(&pos) ) {
-		goto fail;
-	}
-
-	if ( srprs_char(&pos, '@') ) {
-		cbuf_puts(name, "", -1);
-	}
-	else if (!srprs_quoted_string(&pos, name, NULL)) {
-		goto fail;
-	}
-
-	if (!srprs_skipws(&pos) || !srprs_char(&pos, '=')) {
-		goto fail;
-	}
-
-	*ptr = pos;
-	return true;
-
-fail:
-	cbuf_setpos(name, spos);
-	return false;
-}
-
-static bool srprs_val_dword(const char** ptr, uint32_t* type, uint32_t* val)
-{
-	const char* pos = *ptr;
-
-	if (!srprs_str(&pos, "dword:", -1)) {
-		return false;
-	}
-
-	if (!srprs_hex(&pos, 8, val)) {
-		return false;
-	}
-
-	*type = REG_DWORD;
-	*ptr  = pos;
-	return true;
-}
-
-static bool srprs_val_sz(const char** ptr, uint32_t* type, cbuf* val, bool* cont)
-{
-	if (!srprs_quoted_string(ptr, val, cont)) {
-		return false;
-	}
-
-	*type = REG_SZ;
-	return true;
-}
-
-
-static bool srprs_nl_no_eos(const char** ptr, cbuf* str, bool eof)
-{
-	const char* pos = *ptr;
-	const size_t spos = cbuf_getpos(str);
-
-	if( srprs_nl(&pos, str) && (eof || *pos != '\0')) {
-		*ptr = pos;
-		return true;
-	}
-	cbuf_setpos(str, spos);
-	return false;
-}
-
-
-static bool srprs_eol_cont(const char** ptr, bool* cont)
-{
-	const char* pos = *ptr;
-	bool bs = srprs_char(&pos, '\\');
-
-	if (!srprs_eol(&pos, NULL)) {
-		return false;
-	}
-
-	*cont = bs;
-	*ptr = pos;
-	return true;
-}
-
-/* matches the empty string, for zero length lists */
-static bool srprs_val_hex_values(const char** ptr, cbuf* val, bool* cont)
-{
-	const char* pos = *ptr;
-	unsigned u;
-
-	do {
-		if (!srprs_skipws(&pos) || !srprs_hex(&pos, 2, &u) || !srprs_skipws(&pos)) {
-			break;
-		}
-		cbuf_putc(val, (char)u);
-	} while(srprs_char(&pos, ','));
-
-	*ptr = pos;
-
-	if (srprs_skipws(&pos) && srprs_eol_cont(&pos, cont)) {
-		*ptr = pos;
-	}
-
-	return true;
-}
-
-static bool srprs_val_hex(const char** ptr, uint32_t* ptype, cbuf* val,
-		       bool* cont)
-{
-	const char* pos = *ptr;
-	uint32_t type;
-
-	if (!srprs_str(&pos, "hex", -1)) {
-		return false;
-	}
-
-	if (srprs_char(&pos, ':')) {
-		type = REG_BINARY;
-	}
-	else if (!srprs_char(&pos, '(') ||
-		 !srprs_hex(&pos, 8, &type) ||
-		 !srprs_char(&pos,')') ||
-		 !srprs_char(&pos, ':'))
-	{
-		return false;
-	}
-
-	if (!srprs_val_hex_values(&pos, val, cont)) {
-		return false;
-	}
-
-	*ptype = type;
-	*ptr = pos;
-	return true;
-}
-
-
-static bool srprs_comment(const char** ptr, cbuf* str)
-{
-	return srprs_char(ptr, ';') && srprs_line(ptr, str);
-}
-
-/**@}*/
-
-int reg_parse_set_options(struct reg_parse* parser, const char* options)
-{
-	static const char* DEFAULT ="enc=unix,flags=0";
-
-	int ret = 0;
-	char *key, *val;
-	void* ctx = talloc_new(parser);
-
-	if (options == NULL) {
-		options = DEFAULT;
-	}
-
-	while (srprs_option(&options, ctx, &key, &val)) {
-		if ((strcmp(key, "enc") == 0) || (strcmp(key, "strenc") == 0)) {
-		} else if ((strcmp(key, "flags") == 0) && (val != NULL)) {
-			char* end = NULL;
-			if (val != NULL) {
-				parser->flags = strtol(val, &end, 0);
-			}
-			if ((end==NULL) || (*end != '\0')) {
-				DEBUG(0, ("Invalid flags format: %s\n",
-					  val ? val : "<NULL>"));
-				ret = -1;
-			}
-		}
-		/* else if (strcmp(key, "hive") == 0) { */
-		/* 	if (strcmp(val, "short") == 0) { */
-		/* 		f->hive_fmt = REG_FMT_SHORT_HIVES; */
-		/* 	} else if (strcmp(val, "long") == 0) { */
-		/* 		f->hive_fmt = REG_FMT_LONG_HIVES; */
-		/* 	} else if (strcmp(val, "preserve") == 0) { */
-		/* 		f->hive_fmt = REG_FMT_PRESERVE_HIVES; */
-		/* 	} else { */
-		/* 		DEBUG(0, ("Invalid hive format: %s\n", val)); */
-		/* 		ret = -1; */
-		/* 	} */
-		/* } */
-	}
-	talloc_free(ctx);
-	return ret;
-}
-
-
-int reg_parse_line(struct reg_parse* parser, const char* line)
-{
-	const char* pos;
-	bool del=false;
-	cbuf* tmp=cbuf_clear(parser->tmp);
-	bool cb_ok = true;
-	bool cont = true;
-
-	if (!line) {
-		return -4;
-	}
-
-	parser->linenum++;
-	pos = line;
-
-	switch (parser->state) {
-	case STATE_VAL_HEX_CONT:
-		if (srprs_val_hex_values(&pos, parser->valblob, &cont)) {
-			cb_ok = act_val_hex(parser, parser->valblob, cont);
-		}
-		goto done;
-	case STATE_VAL_SZ_CONT:
-		if (srprs_quoted_string(&pos, parser->valblob, &cont)) {
-			cb_ok = act_val_sz(parser, parser->valblob, cont);
-		}
-		goto done;
-	default:
-		cont = false;
-	}
-
-	if ( !srprs_skipws(&pos) ) {
-		return -4;
-	}
-
-	/* empty line ?*/
-	if ( srprs_eol(&pos, NULL) ) {
-		return 0;
-	}
-
-	/* key line ?*/
-	else if (srprs_key(&pos, tmp, &del)) {
-		cb_ok = act_key(parser, tmp, del);
-	}
-
-	/* comment line ? */
-	else if (srprs_comment(&pos, tmp)) {
-		cb_ok = act_comment(parser, cbuf_gets(tmp, 0));
-	}
-
-	/* head line */
-	else if ((parser->linenum == 1) && srprs_line(&pos, tmp) ) {
-		/* cb_ok = act_head(parser, cbuf_gets(tmp, 0)); */
-	}
-
-	/* value line ?*/
-	else if (srprs_val_name(&pos, tmp)) {
-		uint32_t dw;
-		cbuf_swap(parser->valname, tmp);
-		cbuf_clear(tmp);
-
-		if (parser->state != STATE_KEY_OPEN) {
-			DEBUG(0, ("value \"%s\" without a key at line: %i",
-				  cbuf_gets(parser->valname, 0), parser->linenum));
-			return -3;
-		}
-
-		if (!srprs_skipws(&pos)) {
-			return -4;
-		}
-
-		if (srprs_char(&pos, '-')) {
-			cb_ok = act_val_del(parser);
-		}
-		else if (srprs_val_dword(&pos, &parser->valtype, &dw)) {
-			cb_ok = act_val_dw(parser, dw);
-		}
-		else if (srprs_val_sz(&pos, &parser->valtype, tmp, &cont)) {
-			cb_ok = act_val_sz(parser, tmp, cont);
-		}
-		else if (srprs_val_hex(&pos, &parser->valtype, tmp, &cont)){
-			cb_ok = act_val_hex(parser, tmp, cont);
-		}
-		else {
-			DEBUG(0, ("value \"%s\" parse error"
-				  "at line: %i pos: %li : %s",
-				  cbuf_gets(parser->valname, 0), parser->linenum,
-				  (long int)(pos-line), pos));
-			return -3;
-		}
-	}
-	else {
-		DEBUG(0, ("unrecognized line %i : %s\n", parser->linenum, line));
-		return -3;
-	}
-
-done:
-	if (!cb_ok)
-		return -2;
-
-	if (!srprs_skipws(&pos) || !srprs_eol(&pos, NULL)) {
-		DEBUG(0, ("trailing garbage at line: %i pos: %li : %s\n",
-			  parser->linenum, (long int)(pos-line), pos));
-		return -1;
-	}
-	return 0;
-}
-
-/******************************************************************************/
-/**
- * @addtogroup misc
- * @{
- */
-static bool lookslike_utf16(const char* line, size_t len, bool* little_endian)
-{
-	static const uint16_t M_LE = 0xFF80;
-	static const uint16_t M_BE = 0x80FF;
-	uint16_t mask;
-	bool le;
-
-	size_t l = MIN(len/2, 64);
-	uint16_t* u = (uint16_t*)line;
-	int i;
-
-	assert(len >= 2);
-
-	if ( u[0] & M_LE ) {
-		le = true;
-		mask = M_LE;
-	} else 	if ( u[0] & M_BE ) {
-		le = false;
-		mask = M_BE;
-	} else {
-		return false;
-	}
-
-	for (i=1; i<l; i++) {
-		if ( u[i] & mask ) {
-			return false;
-		}
-	}
-
-	*little_endian = le;
-	return true;
-}
-
-static bool lookslike_dos(const char* line, size_t len)
-{
-	int i;
-	for (i=0; i<len; i++) {
-		if ( (line[i] == '\0') || (line[i] & 0x80) ) {
-			return false;
-		}
-		if ( (line[i] == '\r') && (i+1 < len) && (line[i+1] == '\n') ) {
-			return true;
-		}
-	}
-	return false;
-}
-
-static bool guess_charset(const char** ptr,
-			  size_t* len,
-			  const char** file_enc,
-			  const char** str_enc)
-{
-	const char* charset = NULL;
-	const char* pos = *ptr;
-
-	if (*len < 4) {
-		return false;
-	}
-
-	if (srprs_bom(&pos, &charset, NULL)) {
-		*len -= (pos - *ptr);
-		*ptr = pos;
-		if (*file_enc == NULL) {
-			*file_enc = charset;
-		}
-		else if( strcmp(*file_enc, charset) != 0 ) {
-			DEBUG(0, ("file encoding forced to %s\n",
-				  *file_enc));
-		}
-	}
-	else if (*file_enc == NULL) {
-		bool le;
-		if (lookslike_utf16(*ptr, *len, &le)) {
-			*file_enc = le ? "UTF-16LE" : "UTF-16BE";
-		}
-		else if (lookslike_dos(*ptr, *len)) {
-			*file_enc = "dos";
-		}
-		else {
-			*file_enc = "unix";
-		}
-	}
-
-	if ((str_enc != NULL) && (*str_enc == NULL)) {
-		*str_enc = ( strncmp(*ptr, "REGEDIT4", 8) == 0)
-			? *file_enc
-			: "UTF-16LE";
-	}
-
-	return true;
-}
-/**@}*/
-
-struct reg_parse_fd_opt {
-	const char* file_enc;
-	const char* str_enc;
-	unsigned flags;
-	int fail_level;
-};
-
-static struct reg_parse_fd_opt
-reg_parse_fd_opt(void* mem_ctx, const char* options)
-{
-	struct reg_parse_fd_opt ret = {
-		.file_enc = NULL,
-		.str_enc  = NULL,
-		.flags    = 0,
-	};
-
-	void* ctx = talloc_new(mem_ctx);
-	char *key, *val;
-
-	if (options == NULL) {
-		goto done;
-	}
-
-	while (srprs_option(&options, ctx, &key, &val)) {
-		if (strcmp(key, "enc") == 0) {
-			ret.file_enc = talloc_steal(mem_ctx, val);
-			ret.str_enc  = ret.file_enc;
-		} else if (strcmp(key, "strenc") == 0) {
-			ret.str_enc = talloc_steal(mem_ctx, val);
-		} else if (strcmp(key, "fileenc") == 0) {
-			ret.file_enc = talloc_steal(mem_ctx, val);
-		} else if ((strcmp(key, "flags") == 0) && (val != NULL)) {
-			char* end = NULL;
-			if (val != NULL) {
-				ret.flags = strtol(val, &end, 0);
-			}
-			if ((end==NULL) || (*end != '\0')) {
-				DEBUG(0, ("Invalid format \"%s\": %s\n",
-					  key, val ? val : "<NULL>"));
-			}
-		} else if ((strcmp(key, "fail") == 0) && (val != NULL)) {
-			char* end = NULL;
-			if (val != NULL) {
-				ret.fail_level = -strtol(val, &end, 0);
-			}
-			if ((end==NULL) || (*end != '\0')) {
-				DEBUG(0, ("Invalid format \"%s\": %s\n",
-					  key, val ? val : "<NULL>"));
-			}
-		}
-	}
-done:
-	talloc_free(ctx);
-	return ret;
-}
-
-
-static void
-handle_iconv_errno(int err, const char* obuf, size_t linenum,
-		   smb_iconv_t cd, const char** iptr, size_t* ilen,
-		   char** optr, size_t *olen)
-{
-	const char *pos = obuf;
-	const char *ptr = obuf;
-	switch(err) {
-	case EINVAL:
-		/* DEBUG(0, ("Incomplete multibyte sequence\n")); */
-	case E2BIG:
-		return;
-	case EILSEQ:
-		break;
-	default:
-		assert(false);
-	}
-
-	**optr = '\0';
-	while (srprs_line(&ptr, NULL) && srprs_nl(&ptr, NULL)) {
-		pos = ptr;
-		linenum++;
-	}
-	if (pos == *optr) {
-		pos = MAX(obuf, *optr-60);
-	}
-	DEBUG(0, ("Illegal multibyte sequence at line %lu: %s",
-		  (long unsigned)(linenum+1), pos));
-
-	assert(ilen > 0);
-	do {
-		size_t il = 1;
-		DEBUGADD(0, ("<%02x>", (unsigned char)**iptr));
-
-		if (olen > 0) {
-			*(*optr)++ = '\?';
-			(*iptr)++;
-			/* Todo: parametrize, e.g. skip: *optr++ = *iptr++; */
-			(*ilen)--;
-		}
-
-		if (smb_iconv(cd, iptr, &il, optr, olen) != (size_t)-1 || (errno != EILSEQ)) {
-			if(il == 0)
-				(*ilen)-- ;
-			break;
-		}
-
-	}
-	while ((*ilen > 0) && (*olen > 0));
-
-	DEBUGADD(0, ("\n"));
-
-}
-
-int reg_parse_fd(int fd, const struct reg_parse_callback* cb, const char* opts)
-{
-	void* mem_ctx            = talloc_stackframe();
-	cbuf* line               = cbuf_new(mem_ctx);
-	smb_iconv_t cd           = (smb_iconv_t)-1;
-	struct reg_parse* parser = NULL;
-	char buf_raw[1024];
-	char buf_unix[1025];
-
-	ssize_t nread;
-	size_t  nconv;
-	const char* pos;
-	const char* iptr;
-	char* optr;
-        size_t ilen;
-	size_t olen;
-	int ret = -1;
-	bool eof = false;
-	size_t linenum = 0;
-
-	struct reg_parse_fd_opt opt = reg_parse_fd_opt(mem_ctx, opts);
-
-	if (cb == NULL) {
-		DEBUG(0,("reg_parse_fd: NULL callback\n"));
-		goto done;
-	}
-
-	nread = read(fd, buf_raw, sizeof(buf_raw));
-	if (nread < 0) {
-		DEBUG(0, ("reg_parse_fd: read failed: %s\n", strerror(errno)));
-		ret = nread;
-		goto done;
-	}
-
-	iptr = &buf_raw[0];
-	ilen = nread;
-
-	if (!guess_charset(&iptr, &ilen,
-			   &opt.file_enc, &opt.str_enc))
-	{
-		DEBUG(0, ("reg_parse_fd: failed to guess encoding\n"));
-		goto done;
-	}
-
-	DEBUG(10, ("reg_parse_fd: encoding file: %s str: %s\n",
-		  opt.file_enc, opt.str_enc));
-
-
-	if (!set_iconv(&cd, "unix", opt.file_enc)) {
-		DEBUG(0, ("reg_parse_fd: failed to set file encoding %s\n",
-			  opt.file_enc));
-		goto done;
-	}
-
-	parser = reg_parse_new(mem_ctx, *cb, opt.str_enc, opt.flags);
-
-	optr = &buf_unix[0];
-	while (!eof) {
-		olen = sizeof(buf_unix) - (optr - buf_unix) - 1 ;
-		while ( olen > 0 ) {
-			memmove(buf_raw, iptr, ilen);
-
-			nread = read(fd, buf_raw + ilen, sizeof(buf_raw) - ilen);
-			if (nread < 0) {
-				DEBUG(0, ("reg_parse_fd: read failed: %s\n", strerror(errno)));
-				ret = nread;
-				goto done;
-			}
-
-			iptr =  buf_raw;
-			ilen += nread;
-
-			if (ilen == 0) {
-				smb_iconv(cd, NULL, NULL, &optr, &olen);
-				eof = true;
-				break;
-			}
-
-			nconv = smb_iconv(cd, &iptr, &ilen, &optr, &olen);
-
-			if (nconv == (size_t)-1) {
-				handle_iconv_errno(errno, buf_unix, linenum,
-						   cd, &iptr, &ilen,
-						   &optr, &olen);
-				break;
-			}
-		}
-	/* process_lines: */
-		*optr = '\0';
-		pos = &buf_unix[0];
-
-		while ( srprs_line(&pos, line) && srprs_nl_no_eos(&pos, line, eof)) {
-			linenum ++;
-			ret = reg_parse_line(parser, cbuf_gets(line, 0));
-			if (ret < opt.fail_level) {
-				goto done;
-			}
-			cbuf_clear(line);
-		}
-		memmove(buf_unix, pos, optr - pos);
-		optr -= (pos - buf_unix);
-	}
-
-	ret = 0;
-done:
-	set_iconv(&cd, NULL, NULL);
-	talloc_free(mem_ctx);
-	return ret;
-}
-
-int reg_parse_file(const char* fname, const struct reg_parse_callback* cb,
-		   const char* opt)
-{
-	int ret = -1;
-	int fd;
-
-	fd = open(fname, O_RDONLY);
-	if (fd < 0) {
-		DEBUG(0, ("reg_parse_file: open failed: %s\n", strerror(errno)));
-		return -1;
-	}
-
-	ret = reg_parse_fd(fd, cb, opt);
-
-	close(fd);
-	return ret;
-}
-
-/* static struct registry_key *find_regkey_by_hnd(pipes_struct *p, */
-/* 					       struct policy_handle *hnd) */
-/* { */
-/* 	struct registry_key *regkey = NULL; */
-
-/* 	if(!find_policy_by_hnd(p,hnd,(void **)(void *)&regkey)) { */
-/* 		DEBUG(2,("find_regkey_index_by_hnd: Registry Key not found: ")); */
-/* 		return NULL; */
-/* 	} */
-
-/* 	return regkey; */
-/* } */
diff --git a/source3/registry/reg_parse.h b/source3/registry/reg_parse.h
deleted file mode 100644
index 0694225ef5..0000000000
--- a/source3/registry/reg_parse.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Samba Unix/Linux SMB client library
- *
- * Copyright (C) Gregor Beck 2010
- *
- * 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/>.
- */
-
-/**
- * @brief  Parser for registration entries (.reg) files.
- * A parser is a talloced incarnation of an opaque struct reg_parse.
- * It is fed with the (.reg) file line by line calling @ref reg_parse_line
- * and emits output by calling functions from its reg_parse_callback.
- * @file   reg_parse.h
- * @author Gregor Beck <gb@sernet.de>
- * @date   Jun 2010
- */
-
-#ifndef REG_PARSE_H
-#define REG_PARSE_H
-
-#include <stdint.h>
-#include <stdbool.h>
-
-/**
- * Protoype for function called on key found.
- * The usual action to take is delete the key if del==true, open it if
- * already existing or create a new one.
- *
- * @param private_data
- * @param key
- * @param klen number of elements in key
- * @param del whether to delete the key
- *
- * @retval >=0 on success
- *
- * @see reg_format_key
- */
-typedef int (*reg_parse_callback_key_t) (void* private_data,
-					 const char* key[],
-					 size_t klen,
-					 bool del);
-
-/**
- * Protoype for function called on value found.
- * The usual action to take is set the value of the last opened key.
- *
- * @param private_data
- * @param name the values name
- * @param type the values type
- * @param data the values value
- * @param len  the number of bytes of data
- *
- * @retval >=0 on success
- *
- * @see reg_format_value
- */
-typedef int (*reg_parse_callback_val_t) (void*  private_data,
-					 const char* name,
-					 uint32_t type,
-					 const uint8_t* data,
-					 uint32_t len);
-
-/**
- * Protoype for function called on value delete found.
- * Delete value from the last opened key. It is usually no error if
- * no such value exist.
- *
- * @param private_data
- * @param name
- *
- * @retval >=0 on success
- *
- * @see reg_format_value_delete
- */
-typedef int (*reg_parse_callback_val_del_t) (void* private_data,
-					     const char* name);
-
-
-/**
- * Protoype for function called on comment found.
- *
- * @param private_data
- * @param line comment with marker removed.
- *
- * @retval  >=0 on success
- *
- * @see reg_format_comment
- */
-typedef int (*reg_parse_callback_comment_t) (void* private_data,
-					     const char* line);
-
-/**
- * Type handling the output of a reg_parse object.
- * It containes the functions to call and an opaque data pointer.
- */
-typedef struct reg_parse_callback {
-	reg_parse_callback_key_t key; /**< Function called on key found */
-	reg_parse_callback_val_t val; /**< Function called on value found */
-        /** Function called on value delete found */
-	reg_parse_callback_val_del_t val_del;
-	/** Function called on comment found */
-	reg_parse_callback_comment_t comment;
-	void* data; /**< Private data passed to callback function */
-} reg_parse_callback;
-
-/**
- * A Parser for a registration entries (.reg) file.
- *
- * It may be used as a reg_format_callback, so the following is valid:
- * @code
- * reg_format* f = reg_format_new(mem_ctx,
- *                                (reg_format_callback)reg_parse_new(mem_ctx, cb, NULL, 0),
- *                                NULL, 0, "\\");
- * @endcode
- * @see reg_format
- */
-typedef struct reg_parse reg_parse;
-
-/**
- * Create a new reg_parse object.
- *
- * @param talloc_ctx the talloc parent
- * @param cb         the output handler
- * @param str_enc    the charset of hex encoded strings (REG_MULTI_SZ, REG_EXAND_SZ) if not UTF-16
- * @param flags
- *
- * @return a talloc'ed reg_parse object, NULL on error
- */
-reg_parse* reg_parse_new(const void* talloc_ctx,
-			 reg_parse_callback cb,
-			 const char* str_enc,
-			 unsigned flags);
-
-/**
- * Feed one line to the parser.
- *
- * @param parser
- * @param line one line from a (.reg) file, in UNIX charset
- *
- * @return 0 on success
- *
- * @see reg_format_callback_writeline_t
- */
-int reg_parse_line(struct reg_parse* parser, const char* line);
-
-
-/**
- * Parse a (.reg) file, read from a file descriptor.
- *
- * @param fd the file descriptor
- * @param cb the output handler
- * @param opts
- *
- * @return 0 on success
- */
-int reg_parse_fd(int fd,
-		 const reg_parse_callback* cb,
-		 const char* opts);
-
-/**
- * Parse a (.reg) file
- *
- * @param filename the file to open
- * @param cb the output handler
- * @param opts
- *
- * @return 0 on success
- */
-int reg_parse_file(const char* filename,
-		   const reg_parse_callback* cb,
-		   const char* opts);
-
-int reg_parse_set_options(reg_parse* parser, const char* opt);
-
-/******************************************************************************/
-
-
-#endif /* REG_PARSE_H */
diff --git a/source3/registry/reg_parse_dox.cfg b/source3/registry/reg_parse_dox.cfg
deleted file mode 100644
index 06448cf8ed..0000000000
--- a/source3/registry/reg_parse_dox.cfg
+++ /dev/null
@@ -1,1562 +0,0 @@
-# Doxyfile 1.6.3
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = Registry Import / Export
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       =
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses.
-# With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this tag.
-# The format is ext=language, where ext is a file extension, and language is one of
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
-# doxygen. The layout file controls the global structure of the generated output files
-# in an output format independent way. The create the layout file that represents
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name
-# of the layout file.
-
-LAYOUT_FILE            =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT = reg_parse.c reg_parse.h \
-	reg_import.c reg_import.h \
-	reg_format.c reg_format.h \
-	reg_parse_internal.c reg_parse_internal.h \
-	net_registry.c net_rpc_registry.c \
-	cbuf.c cbuf.h \
-	srprs.c srprs.h
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS          =
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        =
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-
-GENERATE_DOCSET        = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE               =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING     =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
-# are set, an additional index file will be generated that can be used as input for
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
-# HTML documentation.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
-# For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-#  will be generated, which together with the HTML files, form an Eclipse help
-#  plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the help appears.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW      = NO
-
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES       = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE       = 10
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup
-# and does not have live searching capabilities.
-
-SERVER_BASED_SEARCH    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX         = YES
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE      = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = NO
-
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
-
-DOT_FONTNAME           = FreeSans
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK               = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS           =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = YES
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-# Local Variables:
-# mode: makefile
-# compile-command: "doxygen reg_parse_dox.cfg"
-# End:
diff --git a/source3/registry/reg_parse_internal.c b/source3/registry/reg_parse_internal.c
deleted file mode 100644
index dedbe123d8..0000000000
--- a/source3/registry/reg_parse_internal.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/* * Samba Unix/Linux SMB client library
- *
- * 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/>.
- */
-/**
- * @file   reg_parse_internal.h
- * @author Gregor Beck <gb@sernet.de>
- * @date   Sep 2010
- * @brief
- */
-
-#include "reg_parse_internal.h"
-#include "cbuf.h"
-#include "srprs.h"
-#include "registry.h"
-
-size_t iconvert_talloc(const void* ctx,
-		       smb_iconv_t cd,
-		       const char* src, size_t srclen,
-		       char** pdst)
-{
-	size_t dstlen, ret;
-	size_t obytes, ibytes;
-	char *optr, *dst, *tmp;
-	const char* iptr;
-
-	if (cd == NULL || cd == ((smb_iconv_t)-1)) {
-		return -1;
-	}
-
-	dst = *pdst;
-
-	if (dst == NULL) {
-		/*
-		 * Allocate an extra two bytes for the
-		 * terminating zero.
-		 */
-		dstlen = srclen + 2;
-		dst = (char *)talloc_size(ctx, dstlen);
-		if (dst == NULL) {
-			DEBUG(0,("iconver_talloc no mem\n"));
-			return -1;
-		}
-	} else {
-		dstlen = talloc_get_size(dst);
-	}
-convert:
-	iptr   = src;
-	ibytes = srclen;
-	optr   = dst;
-	obytes = dstlen-2;
-
-	ret = smb_iconv(cd, &iptr, &ibytes, &optr, &obytes);
-
-	if(ret == -1) {
-		const char *reason="unknown error";
-		switch(errno) {
-		case EINVAL:
-			reason="Incomplete multibyte sequence";
-			break;
-		case E2BIG:
-			dstlen = 2*dstlen + 2;
-			tmp    = talloc_realloc(ctx, dst, char, dstlen);
-			if (tmp == NULL) {
-				reason="talloc_realloc failed";
-				break;
-			}
-			dst = tmp;
-			goto convert;
-		case EILSEQ:
-			reason="Illegal multibyte sequence";
-			break;
-		}
-		DEBUG(0,("Conversion error: %s(%.80s) %li\n", reason, iptr,
-			 (long int)(iptr-src)));
-		talloc_free(dst);
-		return -1;
-	}
-
-	dstlen = (dstlen-2) - obytes;
-
-	SSVAL(dst, dstlen, 0);
-
-	*pdst = dst;
-	return dstlen;
-}
-
-#ifndef HKEY_CURRENT_CONFIG
-#define HKEY_CURRENT_CONFIG		0x80000005
-#endif
-#ifndef HKEY_DYN_DATA
-#define HKEY_DYN_DATA			0x80000006
-#endif
-#ifndef HKEY_PERFORMANCE_TEXT
-#define HKEY_PERFORMANCE_TEXT		0x80000050
-#endif
-#ifndef HKEY_PERFORMANCE_NLSTEXT
-#define HKEY_PERFORMANCE_NLSTEXT	0x80000060
-#endif
-
-#define HIVE_INFO_ENTRY(SHORT,LONG)			\
-static const struct hive_info HIVE_INFO_##SHORT = {	\
-	.handle = LONG,					\
-	.short_name = #SHORT,				\
-	.short_name_len = sizeof(#SHORT)-1,		\
-	.long_name = #LONG,				\
-	.long_name_len = sizeof(#LONG)-1,		\
-}
-
-HIVE_INFO_ENTRY(HKLM, HKEY_LOCAL_MACHINE);
-HIVE_INFO_ENTRY(HKCU, HKEY_CURRENT_USER);
-HIVE_INFO_ENTRY(HKCR, HKEY_CLASSES_ROOT);
-HIVE_INFO_ENTRY(HKU , HKEY_USERS);
-HIVE_INFO_ENTRY(HKCC, HKEY_CURRENT_CONFIG);
-HIVE_INFO_ENTRY(HKDD, HKEY_DYN_DATA);
-HIVE_INFO_ENTRY(HKPD, HKEY_PERFORMANCE_DATA);
-HIVE_INFO_ENTRY(HKPT, HKEY_PERFORMANCE_TEXT);
-HIVE_INFO_ENTRY(HKPN, HKEY_PERFORMANCE_NLSTEXT);
-#undef HIVE_INFO_ENTRY
-
-static const struct hive_info* HIVE_INFO[] = {
-	&HIVE_INFO_HKLM, &HIVE_INFO_HKCU, &HIVE_INFO_HKCR, &HIVE_INFO_HKU,
-	&HIVE_INFO_HKCC, &HIVE_INFO_HKDD, &HIVE_INFO_HKPD, &HIVE_INFO_HKPT,
-	&HIVE_INFO_HKPN, NULL
-};
-
-const struct hive_info* hive_info(const char* name, int nlen)
-{
-	const struct hive_info** info;
-	char buf[32];
-	int s;
-
-	if (nlen >= sizeof(buf)) {
-		return NULL;
-	}
-	for (s=0; s<nlen; s++) {
-		buf[s] = toupper(name[s]);
-	}
-	buf[s] = '\0';
-
-	if ((s < 3) || (strncmp(buf, "HK", 2) != 0)) {
-		return NULL;
-	}
-
-	if (s <= 4) {
-		for(info = HIVE_INFO; *info; info++) {
-			if (strcmp(buf+2, (*info)->short_name+2) == 0) {
-				return *info;
-			}
-		}
-		return NULL;
-	}
-
-	if ((s < 10) || (strncmp(buf, "HKEY_", 5)) != 0) {
-		return NULL;
-	}
-
-	for(info = HIVE_INFO; *info; info++) {
-		if (strcmp(buf+5, (*info)->long_name+5) == 0) {
-			return *info;
-		}
-	}
-	return NULL;
-}
-
-const char* get_charset(const char* c)
-{
-	if (strcmp(c, "dos") == 0) {
-		return lp_dos_charset();
-	} else if (strcmp(c, "unix") == 0) {
-		return lp_unix_charset();
-	} else {
-		return c;
-	}
-}
-
-bool set_iconv(smb_iconv_t* t, const char* to, const char* from)
-{
-	smb_iconv_t cd = (smb_iconv_t)-1;
-
-	if (to && from) {
-		to   = get_charset(to);
-		from = get_charset(from);
-		cd   = smb_iconv_open(to, from);
-		if (cd == ((smb_iconv_t)-1)) {
-			return false;
-		}
-	}
-	if ((*t != (smb_iconv_t)NULL) && (*t != (smb_iconv_t)-1)) {
-		smb_iconv_close(*t);
-	}
-	*t = cd;
-	return true;
-}
-
-/**
- * Parse option string
- * @param[in,out] ptr parse position
- * @param[in] mem_ctx talloc context
- * @param[out] name ptr 2 value
- * @param[out] value ptr 2 value
- * @return true on success
- */
-bool srprs_option(const char** ptr, const void* mem_ctx, char** name, char** value)
-{
-	const char* pos = *ptr;
-	void* ctx = talloc_new(mem_ctx);
-
-	cbuf* key = cbuf_new(ctx);
-	cbuf* val = NULL;
-
-	while(srprs_charsetinv(&pos, ",= \t\n\r", key))
-		;
-	if (pos == *ptr) {
-		talloc_free(ctx);
-		return false;
-	}
-
-	if (name != NULL) {
-		*name = talloc_steal(mem_ctx, cbuf_gets(key, 0));
-	}
-
-	if (*pos == '=') {
-		val = cbuf_new(ctx);
-		pos++;
-		if (!srprs_quoted_string(ptr, val, NULL)) {
-			while(srprs_charsetinv(&pos, ", \t\n\r", val))
-				;
-		}
-		if (value != NULL) {
-			*value = talloc_steal(mem_ctx, cbuf_gets(val, 0));
-		}
-	} else {
-		if (value != NULL) {
-			*value = NULL;
-		}
-	}
-
-	while(srprs_char(&pos, ','))
-		;
-
-	*ptr = pos;
-	return true;
-}
-
-#define CH_INVALID ((charset_t)-1)
-static const struct {
-	const char* const name;
-	charset_t ctype;
-	int  len;
-	char seq[4];
-} BOM[] = {
-	{"UTF-8",    CH_UTF8,    3, {0xEF, 0xBB, 0xBF}},
-	{"UTF-32LE", CH_INVALID, 4, {0xFF, 0xFE, 0x00, 0x00}},
-	{"UTF-16LE", CH_UTF16LE, 2, {0xFF, 0xFE}},
-	{"UTF-16BE", CH_UTF16BE, 2, {0xFE, 0xFF}},
-	{"UTF-32BE", CH_INVALID, 4, {0x00, 0x00, 0xFE, 0xFF}},
-	{NULL,       CH_INVALID, 0}
-};
-
-bool srprs_bom(const char** ptr, const char** name, charset_t* ctype)
-{
-	int i;
-	for (i=0; BOM[i].name; i++) {
-		if (memcmp(*ptr, BOM[i].seq, BOM[i].len) == 0) {
-			break;
-		}
-	}
-
-	if (BOM[i].name != NULL) {
-		DEBUG(0, ("Found Byte Order Mark for : %s\n", BOM[i].name));
-
-		if (name != NULL) {
-			*name  = BOM[i].name;
-		}
-
-		if (ctype != NULL) {
-			*ctype = BOM[i].ctype;
-		}
-
-		*ptr  += BOM[i].len;
-
-		return true;
-	}
-	return false;
-}
-
-int write_bom(FILE* file, const char* charset, charset_t ctype)
-{
-	int i;
-	if ( charset == NULL ) {
-		for (i=0; BOM[i].name; i++) {
-			if (BOM[i].ctype == ctype) {
-				return fwrite(BOM[i].seq, 1, BOM[i].len, file);
-			}
-		}
-		DEBUG(0, ("No Byte Order Mark for charset_t: %u\n", (unsigned)ctype));
-	} else {
-		for (i=0; BOM[i].name; i++) {
-			if (StrCaseCmp(BOM[i].name, charset) == 0) {
-				return fwrite(BOM[i].seq, 1, BOM[i].len, file);
-			}
-		}
-		DEBUG(0, ("No Byte Order Mark for charset_t: %s\n", charset));
-	}
-	return 0;
-}
-
-
-int cbuf_puts_case(cbuf* s, const char* str, size_t len, enum fmt_case fmt)
-{
-	size_t pos = cbuf_getpos(s);
-	int ret = cbuf_puts(s, str, len);
-	char* ptr = cbuf_gets(s,pos);
-
-	if (ret <= 0) {
-		return ret;
-	}
-
-	switch (fmt) {
-	case FMT_CASE_PRESERVE:
-		break;
-	case FMT_CASE_UPPER:
-		while(*ptr != '\0') {
-			*ptr = toupper(*ptr);
-			ptr++;
-		}
-		break;
-	case FMT_CASE_TITLE:
-		*ptr = toupper(*ptr);
-		ptr++;
-	case FMT_CASE_LOWER:
-		while(*ptr != '\0') {
-			*ptr = tolower(*ptr);
-			ptr++;
-		}
-	}
-	return ret;
-}
diff --git a/source3/registry/reg_parse_internal.h b/source3/registry/reg_parse_internal.h
deleted file mode 100644
index ef59161756..0000000000
--- a/source3/registry/reg_parse_internal.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Samba Unix/Linux SMB client library
- *
- * 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/>.
- */
-
-/**
- * @brief  Some stuff used by reg_parse and reg_format.
- * It might be usefull elsewehre but need some review of the interfaces.
- * @file   reg_parse_internal.h
- * @author Gregor Beck <gb@sernet.de>
- * @date   Sep 2010
- */
-#ifndef __REG_PARSE_INTERNAL_H
-#define __REG_PARSE_INTERNAL_H
-
-#include "includes.h"
-#include "system/iconv.h"
-
-struct cbuf;
-
-#define USE_NATIVE_ICONV
-#if defined USE_NATIVE_ICONV && defined HAVE_NATIVE_ICONV
-#  define smb_iconv_t     iconv_t
-#  define smb_iconv(CD, IPTR, ILEN, OPTR, OLEN) \
-	iconv(CD, (char**)(IPTR), ILEN, OPTR, OLEN)
-#  define smb_iconv_open  iconv_open
-#  define smb_iconv_close iconv_close
-#endif
-
-size_t iconvert_talloc(const void* ctx,
-		       smb_iconv_t cd,
-		       const char* src, size_t srclen,
-		       char** pdst);
-
-struct hive_info {
-	uint32_t handle;
-	const char* short_name;
-	size_t short_name_len;
-	const char* long_name;
-	size_t long_name_len;
-};
-
-const struct hive_info* hive_info(const char* name, int nlen);
-
-const char* get_charset(const char* c);
-
-bool set_iconv(smb_iconv_t* t, const char* to, const char* from);
-
-/**
- * Parse option string
- * @param[in,out] ptr parse position
- * @param[in] mem_ctx talloc context
- * @param[out] name ptr 2 value
- * @param[out] value ptr 2 value
- * @return true on success
- */
-bool srprs_option(const char** ptr, const void* mem_ctx, char** name, char** value);
-
-/**
- * Write Byte Order Mark for \p charset to file.
- * If \c charset==NULL write BOM for \p ctype.
- *
- * @param[in] file file to write to
- * @param[in] charset
- * @param[in] ctype
- *
- * @return number of bytes written, -1 on error
- * @todo write to cbuf
- */
-int write_bom(FILE* file, const char* charset, charset_t ctype);
-
-/**
- * Parse Byte Order Mark.
- *
- * @param[in,out] ptr parse position
- * @param[out] name name of characterset
- * @param[out] ctype charset_t
- *
- * @return true if found
- * @ingroup parse bom
- */
-bool srprs_bom(const char** ptr, const char** name, charset_t* ctype);
-
-enum fmt_case {
-	FMT_CASE_PRESERVE=0,
-	FMT_CASE_UPPER,
-	FMT_CASE_LOWER,
-	FMT_CASE_TITLE
-};
-int cbuf_puts_case(struct cbuf* s, const char* str, size_t len, enum fmt_case fmt);
-
-#endif /* __REG_PARSE_INTERNAL_H */
diff --git a/source3/registry/reg_parse_prs.c b/source3/registry/reg_parse_prs.c
deleted file mode 100644
index 023fd0c400..0000000000
--- a/source3/registry/reg_parse_prs.c
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   Samba memory buffer functions
-   Copyright (C) Andrew Tridgell              1992-1997
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1997
-   Copyright (C) Jeremy Allison               1999
-   Copyright (C) Andrew Bartlett              2003.
-
-   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/>.
-*/
-
-#include "includes.h"
-#include "reg_parse_prs.h"
-#include "rpc_dce.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_PARSE
-
-/*******************************************************************
- Debug output for parsing info
-
- XXXX side-effect of this function is to increase the debug depth XXXX.
-
-********************************************************************/
-
-void prs_debug(prs_struct *ps, int depth, const char *desc, const char *fn_name)
-{
-	DEBUG(5+depth, ("%s%06x %s %s\n", tab_depth(5+depth,depth), ps->data_offset, fn_name, desc));
-}
-
-/**
- * Initialise an expandable parse structure.
- *
- * @param size Initial buffer size.  If >0, a new buffer will be
- * created with talloc().
- *
- * @return False if allocation fails, otherwise True.
- **/
-
-bool prs_init(prs_struct *ps, uint32 size, TALLOC_CTX *ctx, bool io)
-{
-	ZERO_STRUCTP(ps);
-	ps->io = io;
-	ps->bigendian_data = RPC_LITTLE_ENDIAN;
-	ps->align = RPC_PARSE_ALIGN;
-	ps->is_dynamic = False;
-	ps->data_offset = 0;
-	ps->buffer_size = 0;
-	ps->data_p = NULL;
-	ps->mem_ctx = ctx;
-
-	if (size != 0) {
-		ps->buffer_size = size;
-		ps->data_p = (char *)talloc_zero_size(ps->mem_ctx, size);
-		if(ps->data_p == NULL) {
-			DEBUG(0,("prs_init: talloc fail for %u bytes.\n", (unsigned int)size));
-			return False;
-		}
-		ps->is_dynamic = True; /* We own this memory. */
-	} else if (MARSHALLING(ps)) {
-		/* If size is zero and we're marshalling we should allocate memory on demand. */
-		ps->is_dynamic = True;
-	}
-
-	return True;
-}
-
-/*******************************************************************
- Delete the memory in a parse structure - if we own it.
-
- NOTE: Contrary to the somewhat confusing naming, this function is not
-       intended for freeing memory allocated by prs_alloc_mem().
-       That memory is also attached to the talloc context given by
-       ps->mem_ctx, but is only freed when that talloc context is
-       freed. prs_mem_free() is used to delete "dynamic" memory
-       allocated in marshalling/unmarshalling.
- ********************************************************************/
-
-void prs_mem_free(prs_struct *ps)
-{
-	if(ps->is_dynamic) {
-		TALLOC_FREE(ps->data_p);
-	}
-	ps->is_dynamic = False;
-	ps->buffer_size = 0;
-	ps->data_offset = 0;
-}
-
-/*******************************************************************
- Allocate memory when unmarshalling... Always zero clears.
- ********************************************************************/
-
-#if defined(PARANOID_MALLOC_CHECKER)
-char *prs_alloc_mem_(prs_struct *ps, size_t size, unsigned int count)
-#else
-char *prs_alloc_mem(prs_struct *ps, size_t size, unsigned int count)
-#endif
-{
-	char *ret = NULL;
-
-	if (size && count) {
-		/* We can't call the type-safe version here. */
-		ret = (char *)_talloc_zero_array(ps->mem_ctx, size, count,
-						 "parse_prs");
-	}
-	return ret;
-}
-
-/*******************************************************************
- Return the current talloc context we're using.
- ********************************************************************/
-
-TALLOC_CTX *prs_get_mem_context(prs_struct *ps)
-{
-	return ps->mem_ctx;
-}
-
-/*******************************************************************
- Attempt, if needed, to grow a data buffer.
- Also depends on the data stream mode (io).
- ********************************************************************/
-
-bool prs_grow(prs_struct *ps, uint32 extra_space)
-{
-	uint32 new_size;
-
-	ps->grow_size = MAX(ps->grow_size, ps->data_offset + extra_space);
-
-	if(ps->data_offset + extra_space <= ps->buffer_size)
-		return True;
-
-	/*
-	 * We cannot grow the buffer if we're not reading
-	 * into the prs_struct, or if we don't own the memory.
-	 */
-
-	if(UNMARSHALLING(ps) || !ps->is_dynamic) {
-		DEBUG(0,("prs_grow: Buffer overflow - unable to expand buffer by %u bytes.\n",
-				(unsigned int)extra_space));
-		return False;
-	}
-
-	/*
-	 * Decide how much extra space we really need.
-	 */
-
-	extra_space -= (ps->buffer_size - ps->data_offset);
-	if(ps->buffer_size == 0) {
-
-		/*
-		 * Start with 128 bytes (arbitrary value), enough for small rpc
-		 * requests
-		 */
-		new_size = MAX(128, extra_space);
-
-		ps->data_p = (char *)talloc_zero_size(ps->mem_ctx, new_size);
-		if(ps->data_p == NULL) {
-			DEBUG(0,("prs_grow: talloc failure for size %u.\n", (unsigned int)new_size));
-			return False;
-		}
-	} else {
-		/*
-		 * If the current buffer size is bigger than the space needed,
-		 * just double it, else add extra_space. Always keep 64 bytes
-		 * more, so that after we added a large blob we don't have to
-		 * realloc immediately again.
-		 */
-		new_size = MAX(ps->buffer_size*2,
-			       ps->buffer_size + extra_space + 64);
-
-		ps->data_p = talloc_realloc(ps->mem_ctx,
-						ps->data_p,
-						char,
-						new_size);
-		if (ps->data_p == NULL) {
-			DEBUG(0,("prs_grow: Realloc failure for size %u.\n",
-				(unsigned int)new_size));
-			return False;
-		}
-
-		memset(&ps->data_p[ps->buffer_size], '\0', (size_t)(new_size - ps->buffer_size));
-	}
-	ps->buffer_size = new_size;
-
-	return True;
-}
-
-/*******************************************************************
- Get the data pointer (external interface).
-********************************************************************/
-
-char *prs_data_p(prs_struct *ps)
-{
-	return ps->data_p;
-}
-
-/*******************************************************************
- Get the current data size (external interface).
- ********************************************************************/
-
-uint32 prs_data_size(prs_struct *ps)
-{
-	return ps->buffer_size;
-}
-
-/*******************************************************************
- Fetch the current offset (external interface).
- ********************************************************************/
-
-uint32 prs_offset(prs_struct *ps)
-{
-	return ps->data_offset;
-}
-
-/*******************************************************************
- Set the current offset (external interface).
- ********************************************************************/
-
-bool prs_set_offset(prs_struct *ps, uint32 offset)
-{
-	if ((offset > ps->data_offset)
-	    && !prs_grow(ps, offset - ps->data_offset)) {
-		return False;
-	}
-
-	ps->data_offset = offset;
-	return True;
-}
-
-/*******************************************************************
- Append the data from a buffer into a parse_struct.
- ********************************************************************/
-
-bool prs_copy_data_in(prs_struct *dst, const char *src, uint32 len)
-{
-	if (len == 0)
-		return True;
-
-	if(!prs_grow(dst, len))
-		return False;
-
-	memcpy(&dst->data_p[dst->data_offset], src, (size_t)len);
-	dst->data_offset += len;
-
-	return True;
-}
-
-/*******************************************************************
- Align a the data_len to a multiple of align bytes - filling with
- zeros.
- ********************************************************************/
-
-bool prs_align(prs_struct *ps)
-{
-	uint32 mod = ps->data_offset & (ps->align-1);
-
-	if (ps->align != 0 && mod != 0) {
-		uint32 extra_space = (ps->align - mod);
-		if(!prs_grow(ps, extra_space))
-			return False;
-		memset(&ps->data_p[ps->data_offset], '\0', (size_t)extra_space);
-		ps->data_offset += extra_space;
-	}
-
-	return True;
-}
-
-/******************************************************************
- Align on a 8 byte boundary
- *****************************************************************/
-
-bool prs_align_uint64(prs_struct *ps)
-{
-	bool ret;
-	uint8 old_align = ps->align;
-
-	ps->align = 8;
-	ret = prs_align(ps);
-	ps->align = old_align;
-
-	return ret;
-}
-
-/*******************************************************************
- Ensure we can read/write to a given offset.
- ********************************************************************/
-
-char *prs_mem_get(prs_struct *ps, uint32 extra_size)
-{
-	if(UNMARSHALLING(ps)) {
-		/*
-		 * If reading, ensure that we can read the requested size item.
-		 */
-		if (ps->data_offset + extra_size > ps->buffer_size) {
-			DEBUG(0,("prs_mem_get: reading data of size %u would overrun "
-				"buffer by %u bytes.\n",
-				(unsigned int)extra_size,
-				(unsigned int)(ps->data_offset + extra_size - ps->buffer_size) ));
-			return NULL;
-		}
-	} else {
-		/*
-		 * Writing - grow the buffer if needed.
-		 */
-		if(!prs_grow(ps, extra_size))
-			return NULL;
-	}
-	return &ps->data_p[ps->data_offset];
-}
-
-/*******************************************************************
- Change the struct type.
- ********************************************************************/
-
-void prs_switch_type(prs_struct *ps, bool io)
-{
-	if ((ps->io ^ io) == True)
-		ps->io=io;
-}
-
-/*******************************************************************
- Stream a uint8.
- ********************************************************************/
-
-bool prs_uint8(const char *name, prs_struct *ps, int depth, uint8 *data8)
-{
-	char *q = prs_mem_get(ps, 1);
-	if (q == NULL)
-		return False;
-
-	if (UNMARSHALLING(ps))
-		*data8 = CVAL(q,0);
-	else
-		SCVAL(q,0,*data8);
-
-	DEBUGADD(5,("%s%04x %s: %02x\n", tab_depth(5,depth), ps->data_offset, name, *data8));
-
-	ps->data_offset += 1;
-
-	return True;
-}
-
-/*******************************************************************
- Stream a uint16.
- ********************************************************************/
-
-bool prs_uint16(const char *name, prs_struct *ps, int depth, uint16 *data16)
-{
-	char *q = prs_mem_get(ps, sizeof(uint16));
-	if (q == NULL)
-		return False;
-
-	if (UNMARSHALLING(ps)) {
-		if (ps->bigendian_data)
-			*data16 = RSVAL(q,0);
-		else
-			*data16 = SVAL(q,0);
-	} else {
-		if (ps->bigendian_data)
-			RSSVAL(q,0,*data16);
-		else
-			SSVAL(q,0,*data16);
-	}
-
-	DEBUGADD(5,("%s%04x %s: %04x\n", tab_depth(5,depth), ps->data_offset, name, *data16));
-
-	ps->data_offset += sizeof(uint16);
-
-	return True;
-}
-
-/*******************************************************************
- Stream a uint32.
- ********************************************************************/
-
-bool prs_uint32(const char *name, prs_struct *ps, int depth, uint32 *data32)
-{
-	char *q = prs_mem_get(ps, sizeof(uint32));
-	if (q == NULL)
-		return False;
-
-	if (UNMARSHALLING(ps)) {
-		if (ps->bigendian_data)
-			*data32 = RIVAL(q,0);
-		else
-			*data32 = IVAL(q,0);
-	} else {
-		if (ps->bigendian_data)
-			RSIVAL(q,0,*data32);
-		else
-			SIVAL(q,0,*data32);
-	}
-
-	DEBUGADD(5,("%s%04x %s: %08x\n", tab_depth(5,depth), ps->data_offset, name, *data32));
-
-	ps->data_offset += sizeof(uint32);
-
-	return True;
-}
-
-/*******************************************************************
- Stream a uint64_struct
- ********************************************************************/
-bool prs_uint64(const char *name, prs_struct *ps, int depth, uint64 *data64)
-{
-	if (UNMARSHALLING(ps)) {
-		uint32 high, low;
-
-		if (!prs_uint32(name, ps, depth+1, &low))
-			return False;
-
-		if (!prs_uint32(name, ps, depth+1, &high))
-			return False;
-
-		*data64 = ((uint64_t)high << 32) + low;
-
-		return True;
-	} else {
-		uint32 high = (*data64) >> 32, low = (*data64) & 0xFFFFFFFF;
-		return prs_uint32(name, ps, depth+1, &low) &&
-			   prs_uint32(name, ps, depth+1, &high);
-	}
-}
-
-/******************************************************************
- Stream an array of uint8s. Length is number of uint8s.
- ********************************************************************/
-
-bool prs_uint8s(bool charmode, const char *name, prs_struct *ps, int depth, uint8 *data8s, int len)
-{
-	int i;
-	char *q = prs_mem_get(ps, len);
-	if (q == NULL)
-		return False;
-
-	if (UNMARSHALLING(ps)) {
-		for (i = 0; i < len; i++)
-			data8s[i] = CVAL(q,i);
-	} else {
-		for (i = 0; i < len; i++)
-			SCVAL(q, i, data8s[i]);
-	}
-
-	DEBUGADD(5,("%s%04x %s: ", tab_depth(5,depth), ps->data_offset ,name));
-	if (charmode)
-		print_asc(5, (unsigned char*)data8s, len);
-	else {
-		for (i = 0; i < len; i++)
-			DEBUGADD(5,("%02x ", data8s[i]));
-	}
-	DEBUGADD(5,("\n"));
-
-	ps->data_offset += len;
-
-	return True;
-}
diff --git a/source3/registry/reg_parse_prs.h b/source3/registry/reg_parse_prs.h
deleted file mode 100644
index 5b8aeabaa9..0000000000
--- a/source3/registry/reg_parse_prs.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   SMB parameters and setup
-   Copyright (C) Andrew Tridgell 1992-1997
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1997
-   Copyright (C) Paul Ashton 1997
-   Copyright (C) Jeremy Allison 2000-2004
-
-   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/>.
-*/
-
-#ifndef _REG_PARSE_PRS_H_
-#define _REG_PARSE_PRS_H_
-
-
-#define prs_init_empty( _ps_, _ctx_, _io_ ) (void) prs_init((_ps_), 0, (_ctx_), (_io_))
-
-typedef struct _prs_struct {
-	bool io; /* parsing in or out of data stream */
-	/*
-	 * If the (incoming) data is big-endian. On output we are
-	 * always little-endian.
-	 */
-	bool bigendian_data;
-	uint8 align; /* data alignment */
-	bool is_dynamic; /* Do we own this memory or not ? */
-	uint32 data_offset; /* Current working offset into data. */
-	uint32 buffer_size; /* Current allocated size of the buffer. */
-	uint32 grow_size; /* size requested via prs_grow() calls */
-	/* The buffer itself. If "is_dynamic" is true this
-	 * MUST BE TALLOC'ed off mem_ctx. */
-	char *data_p;
-	TALLOC_CTX *mem_ctx; /* When unmarshalling, use this.... */
-} prs_struct;
-
-/*
- * Defines for io member of prs_struct.
- */
-
-#define MARSHALL 0
-#define UNMARSHALL 1
-
-#define MARSHALLING(ps) (!(ps)->io)
-#define UNMARSHALLING(ps) ((ps)->io)
-
-#define RPC_PARSE_ALIGN 4
-
-void prs_debug(prs_struct *ps, int depth, const char *desc, const char *fn_name);
-bool prs_init(prs_struct *ps, uint32 size, TALLOC_CTX *ctx, bool io);
-void prs_mem_free(prs_struct *ps);
-char *prs_alloc_mem_(prs_struct *ps, size_t size, unsigned int count);
-char *prs_alloc_mem(prs_struct *ps, size_t size, unsigned int count);
-TALLOC_CTX *prs_get_mem_context(prs_struct *ps);
-bool prs_grow(prs_struct *ps, uint32 extra_space);
-char *prs_data_p(prs_struct *ps);
-uint32 prs_data_size(prs_struct *ps);
-uint32 prs_offset(prs_struct *ps);
-bool prs_set_offset(prs_struct *ps, uint32 offset);
-bool prs_copy_data_in(prs_struct *dst, const char *src, uint32 len);
-bool prs_align(prs_struct *ps);
-bool prs_align_uint64(prs_struct *ps);
-char *prs_mem_get(prs_struct *ps, uint32 extra_size);
-void prs_switch_type(prs_struct *ps, bool io);
-bool prs_uint8(const char *name, prs_struct *ps, int depth, uint8 *data8);
-bool prs_uint16(const char *name, prs_struct *ps, int depth, uint16 *data16);
-bool prs_uint32(const char *name, prs_struct *ps, int depth, uint32 *data32);
-bool prs_uint64(const char *name, prs_struct *ps, int depth, uint64 *data64);
-bool prs_uint8s(bool charmode, const char *name, prs_struct *ps, int depth, uint8 *data8s, int len);
-
-#endif
diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c
index 8a2b444e01..1991af10ca 100644
--- a/source3/registry/reg_perfcount.c
+++ b/source3/registry/reg_perfcount.c
@@ -20,12 +20,6 @@
  */
 
 #include "includes.h"
-#include "system/filesys.h"
-#include "../librpc/gen_ndr/perfcount.h"
-#include "registry.h"
-#include "reg_perfcount.h"
-#include "../libcli/registry/util_reg.h"
-#include "util_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
@@ -47,11 +41,6 @@ static char *counters_directory(const char *dbname)
 	char *ret = NULL;
 	TALLOC_CTX *ctx = talloc_tos();
 
-	path = state_path(PERFCOUNTDIR);
-	if (!directory_exist(path)) {
-		mkdir(path, 0755);
-	}
-
 	path = talloc_asprintf(ctx, "%s/%s", PERFCOUNTDIR, dbname);
 	if (!path) {
 		return NULL;
@@ -65,6 +54,21 @@ static char *counters_directory(const char *dbname)
 /*********************************************************************
 *********************************************************************/
 
+void perfcount_init_keys( void )
+{
+	char *p = state_path(PERFCOUNTDIR);
+
+	/* no registry keys; just create the perfmon directory */
+
+	if ( !directory_exist( p ) )
+		mkdir( p, 0755 );
+
+	return;
+}
+
+/*********************************************************************
+*********************************************************************/
+
 uint32 reg_perfcount_get_base_index(void)
 {
 	const char *fname = counters_directory( NAMES_DB );
@@ -614,14 +618,14 @@ static bool _reg_perfcount_add_counter(struct PERF_DATA_BLOCK *block,
 	obj = NULL;
 	memset(buf, 0, PERFCOUNT_MAX_LEN);
 	memcpy(buf, data.dptr, data.dsize);
-	begin = strchr(buf, '[');
-	end = strchr(buf, ']');
+	begin = index(buf, '[');
+	end = index(buf, ']');
 	if(begin == NULL || end == NULL)
 		return False;
 	start = begin+1;
 
 	while(start < end) {
-		stop = strchr(start, ',');
+		stop = index(start, ',');
 		if(stop == NULL)
 			stop = end;
 		*stop = '\0';
diff --git a/source3/registry/reg_perfcount.h b/source3/registry/reg_perfcount.h
deleted file mode 100644
index 515790ac52..0000000000
--- a/source3/registry/reg_perfcount.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 
- *  Unix SMB/CIFS implementation.
- *  Virtual Windows Registry Layer
- *
- *  Copyright (C) Marcin Krzysztof Porwit    2005,
- *  Copyright (C) Gerald (Jerry) Carter      2005.
- *  
- *  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/>.
- */
-
-#ifndef _REG_PERFCOUNT_H
-#define _REG_PERFCOUNT_H
-
-#include "reg_parse_prs.h"
-
-uint32 reg_perfcount_get_base_index(void);
-uint32 reg_perfcount_get_last_counter(uint32 base_index);
-uint32 reg_perfcount_get_last_help(uint32 last_counter);
-uint32 reg_perfcount_get_counter_help(uint32 base_index, char **retbuf);
-uint32 reg_perfcount_get_counter_names(uint32 base_index, char **retbuf);
-WERROR reg_perfcount_get_hkpd(prs_struct *ps, uint32 max_buf_size, uint32 *outbuf_len, const char *object_ids);
-
-#endif /* _REG_PERFCOUNT_H */
diff --git a/source3/registry/reg_util_internal.c b/source3/registry/reg_util.c
index a1aeaa405c..fd7652116f 100644
--- a/source3/registry/reg_util_internal.c
+++ b/source3/registry/reg_util.c
@@ -20,8 +20,6 @@
 /* Implementation of registry frontend view functions. */
 
 #include "includes.h"
-#include "registry.h"
-#include "reg_util_internal.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
@@ -86,8 +84,9 @@ bool reg_split_key(char *path, char **base, char **key)
 }
 
 /**
- * The full path to the registry key is used as database key.
- * Leading and trailing '\' characters are stripped.
+ * The full path to the registry key is used as database key
+ * after the \'s are converted to /'s.
+ * Leading and trailing '/' and '\' characters are stripped.
  * Key string is also normalized to UPPER case.
  */
 
@@ -96,22 +95,22 @@ char *normalize_reg_path(TALLOC_CTX *ctx, const char *keyname )
 	char *p;
 	char *nkeyname;
 
-	/* skip leading '\' chars */
+	/* skip leading '/' and '\' chars */
 	p = (char *)keyname;
-	while (*p == '\\') {
+	while ((*p == '/') || (*p == '\\')) {
 		p++;
 	}
 
-	nkeyname = talloc_strdup(ctx, p);
+	nkeyname = talloc_string_sub(ctx, p, "\\", "/");
 	if (nkeyname == NULL) {
 		return NULL;
 	}
 
-	/* strip trailing '\' chars */
-	p = strrchr(nkeyname, '\\');
+	/* strip trailing '/' chars */
+	p = strrchr(nkeyname, '/');
 	while ((p != NULL) && (p[1] == '\0')) {
 		*p = '\0';
-		p = strrchr(nkeyname, '\\');
+		p = strrchr(nkeyname, '/');
 	}
 
 	strupper_m(nkeyname);
@@ -119,6 +118,16 @@ char *normalize_reg_path(TALLOC_CTX *ctx, const char *keyname )
 	return nkeyname;
 }
 
+/**
+ * normalize ther registry path in place.
+ */
+void normalize_dbkey(char *key)
+{
+	size_t len = strlen(key);
+	string_sub(key, "\\", "/", len+1);
+	strupper_m(key);
+}
+
 /**********************************************************************
  move to next non-delimter character
 *********************************************************************/
@@ -138,7 +147,11 @@ char *reg_remaining_path(TALLOC_CTX *ctx, const char *key)
 	}
 	/* normalize_reg_path( new_path ); */
 	if (!(p = strchr(new_path, '\\')) ) {
-		p = new_path;
+		if (!(p = strchr( new_path, '/'))) {
+			p = new_path;
+		} else {
+			p++;
+		}
 	} else {
 		p++;
 	}
diff --git a/source3/registry/reg_util_internal.h b/source3/registry/reg_util_legacy.c
index 0cb370e59d..c99e66a408 100644
--- a/source3/registry/reg_util_internal.h
+++ b/source3/registry/reg_util_legacy.c
@@ -1,28 +1,48 @@
 /* 
  *  Unix SMB/CIFS implementation.
- *  Virtual Windows Registry Layer (utility functions)
+ *  Virtual Windows Registry Layer
  *  Copyright (C) Gerald Carter                     2002-2005
  *
  *  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/>.
  */
 
-#ifndef _REG_UTIL_H
-#define _REG_UTIL_H
+/* Implementation of registry frontend view functions. */
+
+#include "includes.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_REGISTRY
+
+/**
+ * legacy open key function that should be replaced by uses of
+ * reg_open_path
+ */
+WERROR regkey_open_internal(TALLOC_CTX *ctx,
+			    struct registry_key_handle **regkey,
+			    const char *path,
+			    const struct nt_user_token *token,
+			    uint32 access_desired )
+{
+	struct registry_key *key;
+	WERROR err;
 
-bool reg_split_path(char *path, char **base, char **new_path);
-bool reg_split_key(char *path, char **base, char **key);
-char *normalize_reg_path(TALLOC_CTX *ctx, const char *keyname );
-char *reg_remaining_path(TALLOC_CTX *ctx, const char *key);
+	err = reg_open_path(NULL, path, access_desired, token, &key);
+	if (!W_ERROR_IS_OK(err)) {
+		return err;
+	}
 
-#endif /* _REG_UTIL_H */
+	*regkey = talloc_move(ctx, &key->key);
+	TALLOC_FREE(key);
+	return WERR_OK;
+}
diff --git a/source3/registry/reg_util_token.c b/source3/registry/reg_util_token.c
deleted file mode 100644
index ca0159a649..0000000000
--- a/source3/registry/reg_util_token.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Registry helper routines
- * Copyright (C) Michael Adam 2007
- * 
- * 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/>.
- */
-
-#include "includes.h"
-#include "reg_util_token.h"
-#include "../libcli/security/security.h"
-
-/*
- * create a fake token just with enough rights to
- * locally access the registry:
- *
- * - builtin administrators sid
- * - disk operators privilege
- */
-NTSTATUS registry_create_admin_token(TALLOC_CTX *mem_ctx,
-				     struct security_token **ptoken)
-{
-	NTSTATUS status;
-	struct security_token *token = NULL;
-
-	if (ptoken == NULL) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	token = TALLOC_ZERO_P(mem_ctx, struct security_token);
-	if (token == NULL) {
-		DEBUG(1, ("talloc failed\n"));
-		status = NT_STATUS_NO_MEMORY;
-		goto done;
-	}
-	security_token_set_privilege(token, SEC_PRIV_DISK_OPERATOR);
-
-	status = add_sid_to_array(token, &global_sid_Builtin_Administrators,
-				  &token->sids, &token->num_sids);
-	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(1, ("Error adding builtin administrators sid "
-			  "to fake token.\n"));
-		goto done;
-	}
-
-	*ptoken = token;
-
-done:
-	return status;
-}
diff --git a/source3/registry/reg_util_token.h b/source3/registry/reg_util_token.h
deleted file mode 100644
index 558c78728a..0000000000
--- a/source3/registry/reg_util_token.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Registry helper routines
- * Copyright (C) Michael Adam 2007
- * 
- * 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/>.
- */
-
-#ifndef _REG_UTIL_TOKEN_H
-#define _REG_UTIL_TOKEN_H
-
-NTSTATUS registry_create_admin_token(TALLOC_CTX *mem_ctx,
-				     struct security_token **ptoken);
-
-#endif /* _REG_UTIL_TOKEN_H */
diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index bd5380787c..5d9734b15e 100644
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -18,10 +18,7 @@
  */
 
 #include "includes.h"
-#include "system/filesys.h"
 #include "regfio.h"
-#include "../librpc/gen_ndr/ndr_security.h"
-#include "../libcli/security/security_descriptor.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
@@ -32,44 +29,6 @@
  *
  ******************************************************************/
 
-#if defined(PARANOID_MALLOC_CHECKER)
-#define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem_((ps),sizeof(type),(count))
-#else
-#define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem((ps),sizeof(type),(count))
-#endif
-
-/*******************************************************************
- Reads or writes an NTTIME structure.
-********************************************************************/
-
-static bool smb_io_time(const char *desc, NTTIME *nttime, prs_struct *ps, int depth)
-{
-	uint32 low, high;
-	if (nttime == NULL)
-		return False;
-
-	prs_debug(ps, depth, desc, "smb_io_time");
-	depth++;
-
-	if(!prs_align(ps))
-		return False;
-
-	if (MARSHALLING(ps)) {
-		low = *nttime & 0xFFFFFFFF;
-		high = *nttime >> 32;
-	}
-
-	if(!prs_uint32("low ", ps, depth, &low)) /* low part */
-		return False;
-	if(!prs_uint32("high", ps, depth, &high)) /* high part */
-		return False;
-
-	if (UNMARSHALLING(ps)) {
-		*nttime = (((uint64_t)high << 32) + low);
-	}
-
-	return True;
-}
 
 /*******************************************************************
 *******************************************************************/
@@ -994,7 +953,7 @@ static REGF_SK_REC* find_sk_record_by_offset( REGF_FILE *file, uint32 offset )
 /*******************************************************************
 *******************************************************************/
 
-static REGF_SK_REC* find_sk_record_by_sec_desc( REGF_FILE *file, struct security_descriptor *sd )
+static REGF_SK_REC* find_sk_record_by_sec_desc( REGF_FILE *file, SEC_DESC *sd )
 {
 	REGF_SK_REC *p;
 
@@ -1478,7 +1437,7 @@ static REGF_HBIN* regf_hbin_allocate( REGF_FILE *file, uint32 block_size )
 	hbin->file_off       = sbuf.st_ex_size;
 
 	hbin->free_off       = HBIN_HEADER_REC_SIZE;
-	hbin->free_size      = block_size - hbin->free_off + sizeof(uint32);
+	hbin->free_size      = block_size - hbin->free_off + sizeof(uint32);;
 
 	hbin->block_size     = block_size;
 	hbin->first_hbin_off = hbin->file_off - REGF_BLOCKSIZE;
@@ -1608,7 +1567,7 @@ done:
 /*******************************************************************
 *******************************************************************/
 
-static uint32 sk_record_data_size( struct security_descriptor * sd )
+static uint32 sk_record_data_size( SEC_DESC * sd )
 {
 	uint32 size, size_mod8;
 
@@ -1616,7 +1575,7 @@ static uint32 sk_record_data_size( struct security_descriptor * sd )
 
 	/* the record size is sizeof(hdr) + name + static members + data_size_field */
 
-	size = sizeof(uint32)*5 + ndr_size_security_descriptor(sd, 0) + sizeof(uint32);
+	size = sizeof(uint32)*5 + ndr_size_security_descriptor(sd, NULL, 0) + sizeof(uint32);
 
 	/* multiple of 8 */
 	size_mod8 = size & 0xfffffff8;
@@ -1758,7 +1717,7 @@ static int hashrec_cmp( REGF_HASH_REC *h1, REGF_HASH_REC *h2 )
 
  REGF_NK_REC* regfio_write_key( REGF_FILE *file, const char *name,
                                struct regval_ctr *values, struct regsubkey_ctr *subkeys,
-                               struct security_descriptor *sec_desc, REGF_NK_REC *parent )
+                               SEC_DESC *sec_desc, REGF_NK_REC *parent )
 {
 	REGF_NK_REC *nk;
 	REGF_HBIN *vlist_hbin = NULL;
@@ -1808,7 +1767,8 @@ static int hashrec_cmp( REGF_HASH_REC *h1, REGF_HASH_REC *h2 )
 		parent->subkey_index++;
 
 		/* sort the list by keyname */
-		TYPESAFE_QSORT(parent->subkeys.hashes, parent->subkey_index, hashrec_cmp);
+
+		qsort( parent->subkeys.hashes, parent->subkey_index, sizeof(REGF_HASH_REC), QSORT_CAST hashrec_cmp );
 
 		if ( !hbin_prs_lf_records( "lf_rec", parent->subkeys.hbin, 0, parent ) )
 			return False;
@@ -1846,7 +1806,7 @@ static int hashrec_cmp( REGF_HASH_REC *h1, REGF_HASH_REC *h2 )
 			nk->sec_desc->ref_count = 0;
 			
 			/* size value must be self-inclusive */
-			nk->sec_desc->size      = ndr_size_security_descriptor(sec_desc, 0)
+			nk->sec_desc->size      = ndr_size_security_descriptor(sec_desc, NULL, 0)
 				+ sizeof(uint32);
 
 			DLIST_ADD_END( file->sec_desc_list, nk->sec_desc, REGF_SK_REC *);
@@ -1855,8 +1815,8 @@ static int hashrec_cmp( REGF_HASH_REC *h1, REGF_HASH_REC *h2 )
 			   if this is the first record, then just set the next and prev
 			   offsets to ourself. */
 
-			if ( DLIST_PREV(nk->sec_desc) ) {
-				REGF_SK_REC *prev = DLIST_PREV(nk->sec_desc);
+			if ( nk->sec_desc->prev ) {
+				REGF_SK_REC *prev = nk->sec_desc->prev;
 
 				nk->sec_desc->prev_sk_off = prev->hbin_off + prev->hbin->first_hbin_off - HBIN_HDR_SIZE;
 				prev->next_sk_off = nk->sec_desc->sk_off;
diff --git a/source3/registry/regfio.h b/source3/registry/regfio.h
deleted file mode 100644
index 3c2b6560bf..0000000000
--- a/source3/registry/regfio.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Windows NT registry I/O library
- * Copyright (c) Gerald (Jerry) Carter               2005
- *
- * 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/>.
- */
-
-/************************************************************
- * Most of this information was obtained from 
- * http://www.wednesday.demon.co.uk/dosreg.html
- * Thanks Nigel!
- ***********************************************************/
-
-#include "registry/reg_parse_prs.h"
-#include "registry/reg_objects.h"
-
-#ifndef _REGFIO_H
-#define _REGFIO_H
-
-struct regsubkey_ctr;
-
-/* Macros */
- 
-#define REGF_BLOCKSIZE		0x1000
-#define REGF_ALLOC_BLOCK	0x1000
-
-/* header sizes for various records */
-
-#define REGF_HDR_SIZE		4
-#define HBIN_HDR_SIZE		4
-#define HBIN_HEADER_REC_SIZE	0x24
-#define REC_HDR_SIZE		2
-
-#define REGF_OFFSET_NONE	0xffffffff
-
-/* Flags for the vk records */
-
-#define VK_FLAG_NAME_PRESENT	0x0001
-#define VK_DATA_IN_OFFSET	0x80000000
-
-/* NK record macros */
-
-#define NK_TYPE_LINKKEY		0x0010
-#define NK_TYPE_NORMALKEY	0x0020
-#define NK_TYPE_ROOTKEY		0x002c
-
-#define HBIN_STORE_REF(x, y)	{ x->hbin = y; y->ref_count++ };
-#define HBIN_REMOVE_REF(x, y)	{ x->hbin = NULL; y->ref_count-- /* if the count == 0; we can clean up */ };
-
-
-/* HBIN block */
-struct regf_hbin;
-typedef struct regf_hbin {
-	struct regf_hbin *prev, *next;
-	uint32 file_off;		/* my offset in the registry file */
-	uint32 free_off;		/* offset to free space within the hbin record */
-	uint32 free_size;		/* amount of data left in the block */
-	int ref_count;			/* how many active records are pointing to this block (not used currently) */
-	
-	char   header[HBIN_HDR_SIZE];	/* "hbin" */
-	uint32 first_hbin_off;		/* offset from first hbin block */
-	uint32 block_size;		/* block size of this blockually a multiple of 4096Kb) */
-
-	prs_struct ps;			/* data */
-
-	bool dirty;			/* has this hbin block been modified? */
-} REGF_HBIN;
-
-/* ??? List -- list of key offsets and hashed names for consistency */
-
-typedef struct {
-	uint32 nk_off;
-	uint8 keycheck[sizeof(uint32)];
-	char *fullname;
-} REGF_HASH_REC;
-
-typedef struct {
-	REGF_HBIN *hbin;	/* pointer to HBIN record (in memory) containing this nk record */
-	uint32 hbin_off;	/* offset from beginning of this hbin block */
-	uint32 rec_size;	/* ((start_offset - end_offset) & 0xfffffff8) */
-
-	char header[REC_HDR_SIZE];
-	uint16 num_keys;
-	REGF_HASH_REC *hashes;
-} REGF_LF_REC;
-
-/* Key Value */
-
-typedef struct {
-	REGF_HBIN *hbin;	/* pointer to HBIN record (in memory) containing this nk record */
-	uint32 hbin_off;	/* offset from beginning of this hbin block */
-	uint32 rec_size;	/* ((start_offset - end_offset) & 0xfffffff8) */
-	uint32 rec_off;		/* offset stored in the value list */
-	
-	char header[REC_HDR_SIZE];
-	char *valuename;
-	uint32 data_size;
-	uint32 data_off;
-	uint8  *data;
-	uint32 type;
-	uint16 flag;
-} REGF_VK_REC;
-
-
-/* Key Security */
-struct _regf_sk_rec;
-
-typedef struct _regf_sk_rec {
-	struct _regf_sk_rec *next, *prev;
-	REGF_HBIN *hbin;	/* pointer to HBIN record (in memory) containing this nk record */
-	uint32 hbin_off;	/* offset from beginning of this hbin block */
-	uint32 rec_size;	/* ((start_offset - end_offset) & 0xfffffff8) */
-
-	uint32 sk_off;		/* offset parsed from NK record used as a key
-				   to lookup reference to this SK record */
-
-	char header[REC_HDR_SIZE];
-	uint32 prev_sk_off;
-	uint32 next_sk_off;
-	uint32 ref_count;
-	uint32 size;
-	struct security_descriptor *sec_desc;
-} REGF_SK_REC;
-
-/* Key Name */ 
-
-typedef struct {
-	REGF_HBIN *hbin;	/* pointer to HBIN record (in memory) containing this nk record */
-	uint32 hbin_off;	/* offset from beginning of this hbin block */
-	uint32 subkey_index;	/* index to next subkey record to return */
-	uint32 rec_size;	/* ((start_offset - end_offset) & 0xfffffff8) */
-	
-	/* header information */
-	
-	char header[REC_HDR_SIZE];
-	uint16 key_type;
-	NTTIME mtime;
-	uint32 parent_off;	/* back pointer in registry hive */
-	uint32 classname_off;	
-	char *classname;
-	char *keyname;
-
-	/* max lengths */
-
-	uint32 max_bytes_subkeyname;		/* max subkey name * 2 */
-	uint32 max_bytes_subkeyclassname;	/* max subkey classname length (as if) */
-	uint32 max_bytes_valuename;		/* max valuename * 2 */
-	uint32 max_bytes_value;			/* max value data size */
-
-	/* unknowns */
-
-	uint32 unk_index;			/* nigel says run time index ? */
-	
-	/* children */
-	
-	uint32 num_subkeys;
-	uint32 subkeys_off;	/* hash records that point to NK records */	
-	uint32 num_values;
-	uint32 values_off;	/* value lists which point to VK records */
-	uint32 sk_off;		/* offset to SK record */
-	
-	/* link in the other records here */
-	
-	REGF_LF_REC subkeys;
-	REGF_VK_REC *values;
-	REGF_SK_REC *sec_desc;
-	
-} REGF_NK_REC;
-
-/* REGF block */
- 
-typedef struct {
-	/* run time information */
-
-	int fd;				/* file descriptor */
-	int open_flags;			/* flags passed to the open() call */
-	TALLOC_CTX *mem_ctx;		/* memory context for run-time file access information */
-	REGF_HBIN *block_list;		/* list of open hbin blocks */
-
-	/* file format information */
-
-	char   header[REGF_HDR_SIZE];	/* "regf" */
-	uint32 data_offset;		/* offset to record in the first (or any?) hbin block */
-	uint32 last_block;		/* offset to last hbin block in file */
-	uint32 checksum;		/* XOR of bytes 0x0000 - 0x01FB */
-	NTTIME mtime;
-	
-	REGF_SK_REC *sec_desc_list;	/* list of security descriptors referenced by NK records */
-
-	/* unknowns used to simply writing */
-	
-	uint32 unknown1;
-	uint32 unknown2;
-	uint32 unknown3;
-	uint32 unknown4;
-	uint32 unknown5;
-	uint32 unknown6;
-	
-} REGF_FILE;
-
-/* Function Declarations */
- 
-REGF_FILE*    regfio_open( const char *filename, int flags, int mode );
-int           regfio_close( REGF_FILE *r );
-
-REGF_NK_REC*  regfio_rootkey( REGF_FILE *file );
-REGF_NK_REC*  regfio_fetch_subkey( REGF_FILE *file, REGF_NK_REC *nk );
-REGF_NK_REC*  regfio_write_key ( REGF_FILE *file, const char *name,
-                                 struct regval_ctr *values, struct regsubkey_ctr *subkeys,
-                                 struct security_descriptor *sec_desc, REGF_NK_REC *parent );
-
-
-#endif	/* _REGFIO_H */
-