From: Michael Adam <obnox@samba.org>
Date: Mon, 31 Mar 2008 15:20:07 +0000 (+0200)
Subject: registry: reg_deletevalue should return error, when the value does not exist.
X-Git-Tag: samba-3.3.0pre1~3002
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04b48984bbf84c55bb41a74a11cbcc7358377fed;p=thirdparty%2Fsamba.git

registry: reg_deletevalue should return error, when the value does not exist.

Michael
---

diff --git a/source/registry/reg_api.c b/source/registry/reg_api.c
index e52aaacb4d5..1a0bf2b16aa 100644
--- a/source/registry/reg_api.c
+++ b/source/registry/reg_api.c
@@ -653,6 +653,19 @@ WERROR reg_setvalue(struct registry_key *key, const char *name,
 	return WERR_OK;
 }
 
+static WERROR reg_value_exists(struct registry_key *key, const char *name)
+{
+	int i;
+
+	for (i=0; i<key->values->num_values; i++) {
+		if (strequal(key->values->values[i]->valuename, name)) {
+			return WERR_OK;
+		}
+	}
+
+	return WERR_BADFILE;
+}
+
 WERROR reg_deletevalue(struct registry_key *key, const char *name)
 {
 	WERROR err;
@@ -665,6 +678,11 @@ WERROR reg_deletevalue(struct registry_key *key, const char *name)
 		return err;
 	}
 
+	err = reg_value_exists(key, name);
+	if (!W_ERROR_IS_OK(err)) {
+		return err;
+	}
+
 	regval_ctr_delvalue(key->values, name);
 
 	if (!store_reg_values(key->key, key->values)) {