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

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Sun Jan 30 14:53:13 CET 2011 on sn-devel-104

diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 7ad0f368231e9ac52918d33a35f94ac2535e6d11..1e87e809fb82b3aa8ccbd054f630e6e241714879 100644 (file)
--- 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;