From e57d4c41d7606ab7853383f5de2f572e01bb7942 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 30 Jan 2011 13:49:14 +0100 Subject: s3:net registry: ignore WERR_BADFILE when --force is given in deletekey[_recursive] Autobuild-User: Michael Adam Autobuild-Date: Sun Jan 30 14:53:13 CET 2011 on sn-devel-104 --- source3/utils/net_registry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/utils') diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c index 7ad0f36823..1e87e809fb 100644 --- a/source3/utils/net_registry.c +++ b/source3/utils/net_registry.c @@ -277,7 +277,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 %s: %s\n", _("failed"), win_errstr(werr)); goto done; -- cgit