From: Michael Adam <obnox@samba.org>
Date: Sun, 30 Jan 2011 12:49:14 +0000 (+0100)
Subject: s3:net registry: ignore WERR_BADFILE when --force is given in deletekey[_recursive]
X-Git-Url: http://git.samba.org/?p=obnox%2Fsamba-ctdb.git;a=commitdiff_plain;h=6edb49f16f47536e1bfdc2145d5d61897718f415

s3:net registry: ignore WERR_BADFILE when --force is given in deletekey[_recursive]
---

diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index b3e4f862b7..089ab0b266 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -258,7 +258,9 @@ static int net_registry_deletekey_internal(struct net_context *c, int argc,
 	} else {
 		werr = reg_deletekey(hivekey, subkeyname);
 	}
-	if (!W_ERROR_IS_OK(werr)) {
+	if (!W_ERROR_IS_OK(werr) &&
+	    !(c->opt_force && W_ERROR_EQUAL(werr, WERR_BADFILE)))
+	{
 		d_fprintf(stderr, "reg_deletekey failed: %s\n",
 			  win_errstr(werr));
 		goto done;