From: Michael Adam <obnox@samba.org>
Date: Thu, 3 Apr 2008 13:16:01 +0000 (+0200)
Subject: libsmbconf: move initialization of registry value down after error checks.
X-Git-Tag: samba-3.3.0pre1~2927
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a8029985f9bde4da8ca20bc24d937150eab444c;p=thirdparty%2Fsamba.git

libsmbconf: move initialization of registry value down after error checks.

Michael
---

diff --git a/source/lib/smbconf/smbconf_reg.c b/source/lib/smbconf/smbconf_reg.c
index 77e6233cb40..b40c37e60e7 100644
--- a/source/lib/smbconf/smbconf_reg.c
+++ b/source/lib/smbconf/smbconf_reg.c
@@ -220,12 +220,6 @@ static WERROR smbconf_reg_set_value(struct registry_key *key,
 		goto done;
 	}
 
-	ZERO_STRUCT(val);
-
-	val.type = REG_SZ;
-	val.v.sz.str = CONST_DISCARD(char *, canon_valstr);
-	val.v.sz.len = strlen(canon_valstr) + 1;
-
 	if (registry_smbconf_valname_forbidden(canon_valname)) {
 		DEBUG(5, ("Parameter '%s' not allowed in registry.\n",
 			  canon_valname));
@@ -251,6 +245,12 @@ static WERROR smbconf_reg_set_value(struct registry_key *key,
 		goto done;
 	}
 
+	ZERO_STRUCT(val);
+
+	val.type = REG_SZ;
+	val.v.sz.str = CONST_DISCARD(char *, canon_valstr);
+	val.v.sz.len = strlen(canon_valstr) + 1;
+
 	werr = reg_setvalue(key, canon_valname, &val);
 	if (!W_ERROR_IS_OK(werr)) {
 		DEBUG(5, ("Error adding value '%s' to "