s3:net registry: ignore WERR_BADFILE when --force is given in deletekey[_recursive]
authorMichael Adam <obnox@samba.org>
Sun, 30 Jan 2011 12:49:14 +0000 (13:49 +0100)
committerVolker Lendecke <vl@samba.org>
Mon, 31 Jan 2011 10:57:51 +0000 (11:57 +0100)
source3/utils/net_registry.c

index b3e4f862b7b4d94f56c7eaf7fae8b7a5bd298855..089ab0b2662fda18bf39a8efb18bda6352caf682 100644 (file)
@@ -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;