2 files changed, 7 insertions, 24 deletions

diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 18589a9285..600c1f60e7 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -686,13 +686,7 @@ static int nt_apply_reg_command_file(struct registry_context *r, const char *cmd
 
 		  /* If we found it, apply the other bits, else create such a key */
 		  if (W_ERROR_EQUAL(error, WERR_DEST_NOT_FOUND)) {
-			  if(W_ERROR_IS_OK(reg_key_add_name_recursive_abs(r, cmd->key))) {
-				  error = reg_open_key_abs(mem_ctx, r, cmd->key, &tmp);
-				  if(!W_ERROR_IS_OK(error)) {
-					DEBUG(0, ("Error finding new key '%s' after it has been added\n", cmd->key));
-					continue;
-				  }
-			  } else {
+			  if(!W_ERROR_IS_OK(reg_key_add_abs(mem_ctx, r, cmd->key, 0, NULL, &tmp))) {
 					DEBUG(0, ("Error adding new key '%s'\n", cmd->key));
 					continue;
 			  }
@@ -730,13 +724,7 @@ static int nt_apply_reg_command_file(struct registry_context *r, const char *cmd
 		   * Find the key if it exists, and delete it ...
 		   */
 
-		  error = reg_open_key_abs(mem_ctx, r, cmd->key, &tmp);
-		  if(!W_ERROR_IS_OK(error)) {
-			  DEBUG(0, ("Unable to open key '%s'\n", cmd->key));
-			  continue;
-		  }
-		  
-		  error = reg_key_del_recursive(tmp);
+		  error = reg_key_del_abs(r, cmd->key); 
 		  if(!W_ERROR_IS_OK(error)) {
 			  DEBUG(0, ("Unable to delete key '%s'\n", cmd->key));
 			  continue;
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 0a09708869..6de8b25c9c 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -120,18 +120,12 @@ static struct registry_key *cmd_mkkey(TALLOC_CTX *mem_ctx, struct registry_key *
 
 static struct registry_key *cmd_rmkey(TALLOC_CTX *mem_ctx, struct registry_key *cur, int argc, char **argv)
 { 
-	struct registry_key *key;
 	if(argc < 2) {
 		fprintf(stderr, "Usage: rmkey <name>\n");
 		return NULL;
 	}
 
-	if(!W_ERROR_IS_OK(reg_open_key(mem_ctx, cur, argv[1], &key))) {
-		fprintf(stderr, "No such subkey '%s'\n", argv[1]);
-		return NULL;
-	}
-
-	if(!W_ERROR_IS_OK(reg_key_del(key))) {
+	if(!W_ERROR_IS_OK(reg_key_del(cur, argv[1]))) {
 		fprintf(stderr, "Error deleting '%s'\n", argv[1]);
 	} else {
 		fprintf(stderr, "Successfully deleted '%s'\n", argv[1]);
@@ -259,9 +253,10 @@ static char **reg_complete_command(const char *text, int end)
 	return matches;
 
 cleanup:
-	while (i >= 0) {
-		free(matches[i]);
-		i--;
+	count--;
+	while (count >= 0) {
+		free(matches[count]);
+		count--;
 	}
 	free(matches);
 	return NULL;