libsmbconf: move initialization of registry value down after error checks.
authorMichael Adam <obnox@samba.org>
Thu, 3 Apr 2008 13:16:01 +0000 (15:16 +0200)
committerMichael Adam <obnox@samba.org>
Thu, 3 Apr 2008 13:43:04 +0000 (15:43 +0200)
Michael
(This used to be commit 2a8029985f9bde4da8ca20bc24d937150eab444c)

source3/lib/smbconf/smbconf_reg.c

index 77e6233cb4036f0803e4970b9d60e8e852caba89..b40c37e60e7b94c530abc22e9256757a4f45392a 100644 (file)
@@ -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 "