libsmbconf: Convert smbconf_create_share() to smbErr.
[ira/wip.git] / source3 / lib / smbconf / smbconf_reg.c
index 6edb9ed22e8a998e6cfb483c17e37e86a6d44105..78a3145db50dc0f5041a8e0ab4aa21c924e419b2 100644 (file)
  */
 
 #include "includes.h"
-#include "smbconf_private.h"
+#include "lib/smbconf/smbconf_private.h"
+#include "registry.h"
+#include "registry/reg_api.h"
+#include "registry/reg_backend_db.h"
+#include "registry/reg_util_token.h"
+#include "registry/reg_api_util.h"
+#include "registry/reg_init_smbconf.h"
+#include "lib/smbconf/smbconf_init.h"
+#include "lib/smbconf/smbconf_reg.h"
+#include "../libcli/registry/util_reg.h"
 
 #define INCLUDES_VALNAME "includes"
 
 struct reg_private_data {
-       NT_USER_TOKEN *token;
+       struct registry_key *base_key;
        bool open;              /* did _we_ open the registry? */
 };
 
@@ -71,54 +80,6 @@ static bool smbconf_reg_valname_valid(const char *valname)
                lp_parameter_is_valid(valname));
 }
 
-/**
- * Open a registry key specified by "path"
- */
-static WERROR smbconf_reg_open_path(TALLOC_CTX *mem_ctx,
-                                   struct smbconf_ctx *ctx,
-                                   const char *path,
-                                   uint32 desired_access,
-                                   struct registry_key **key)
-{
-       WERROR werr = WERR_OK;
-
-       if (ctx == NULL) {
-               DEBUG(1, ("Error: configuration is not open!\n"));
-               werr = WERR_INVALID_PARAM;
-               goto done;
-       }
-
-       if (rpd(ctx)->token == NULL) {
-               DEBUG(1, ("Error: token missing from smbconf_ctx. "
-                         "was smbconf_init() called?\n"));
-               werr = WERR_INVALID_PARAM;
-               goto done;
-       }
-
-       werr = ctx->ops->open_conf(ctx);
-       if (!W_ERROR_IS_OK(werr)) {
-               DEBUG(1, ("Error opening the registry.\n"));
-               goto done;
-       }
-
-       if (path == NULL) {
-               DEBUG(1, ("Error: NULL path string given\n"));
-               werr = WERR_INVALID_PARAM;
-               goto done;
-       }
-
-       werr = reg_open_path(mem_ctx, path, desired_access, rpd(ctx)->token,
-                            key);
-
-       if (!W_ERROR_IS_OK(werr)) {
-               DEBUG(5, ("Error opening registry path '%s': %s\n",
-                         path, dos_errstr(werr)));
-       }
-
-done:
-       return werr;
-}
-
 /**
  * Open a subkey of the base key (i.e a service)
  */
@@ -128,39 +89,22 @@ static WERROR smbconf_reg_open_service_key(TALLOC_CTX *mem_ctx,
                                           uint32 desired_access,
                                           struct registry_key **key)
 {
-       WERROR werr = WERR_OK;
-       char *path = NULL;
+       WERROR werr;
 
        if (servicename == NULL) {
-               path = talloc_strdup(mem_ctx, ctx->path);
-       } else {
-               path = talloc_asprintf(mem_ctx, "%s\\%s", ctx->path,
-                                      servicename);
-       }
-       if (path == NULL) {
-               werr = WERR_NOMEM;
-               goto done;
+               *key = rpd(ctx)->base_key;
+               return WERR_OK;
        }
+       werr = reg_openkey(mem_ctx, rpd(ctx)->base_key, servicename,
+                          desired_access, key);
 
-       werr = smbconf_reg_open_path(mem_ctx, ctx, path, desired_access, key);
+       if (W_ERROR_EQUAL(werr, WERR_BADFILE)) {
+               werr = WERR_NO_SUCH_SERVICE;
+       }
 
-done:
-       TALLOC_FREE(path);
        return werr;
 }
 
-/**
- * open the base key
- */
-static WERROR smbconf_reg_open_base_key(TALLOC_CTX *mem_ctx,
-                                       struct smbconf_ctx *ctx,
-                                       uint32 desired_access,
-                                       struct registry_key **key)
-{
-       return smbconf_reg_open_path(mem_ctx, ctx, ctx->path, desired_access,
-                                    key);
-}
-
 /**
  * check if a value exists in a given registry key
  */
@@ -176,20 +120,20 @@ static bool smbconf_value_exists(struct registry_key *key, const char *param)
                ret = true;
        }
 
-       TALLOC_FREE(ctx);
+       talloc_free(ctx);
        return ret;
 }
 
 /**
  * create a subkey of the base key (i.e. a service...)
  */
-static WERROR smbconf_reg_create_service_key(TALLOC_CTX *mem_ctx,
+static sbcErr smbconf_reg_create_service_key(TALLOC_CTX *mem_ctx,
                                             struct smbconf_ctx *ctx,
                                             const char * subkeyname,
                                             struct registry_key **newkey)
 {
-       WERROR werr = WERR_OK;
-       struct registry_key *create_parent = NULL;
+       WERROR werr;
+       sbcErr err = SBC_ERR_OK;
        TALLOC_CTX *create_ctx;
        enum winreg_CreateAction action = REG_ACTION_NONE;
 
@@ -198,26 +142,20 @@ static WERROR smbconf_reg_create_service_key(TALLOC_CTX *mem_ctx,
         * and will be destroyed when leaving this function... */
        create_ctx = talloc_stackframe();
 
-       werr = smbconf_reg_open_base_key(create_ctx, ctx, REG_KEY_WRITE,
-                                        &create_parent);
-       if (!W_ERROR_IS_OK(werr)) {
-               goto done;
-       }
-
-       werr = reg_createkey(mem_ctx, create_parent, subkeyname,
+       werr = reg_createkey(mem_ctx, rpd(ctx)->base_key, subkeyname,
                             REG_KEY_WRITE, newkey, &action);
        if (W_ERROR_IS_OK(werr) && (action != REG_CREATED_NEW_KEY)) {
                DEBUG(10, ("Key '%s' already exists.\n", subkeyname));
-               werr = WERR_FILE_EXISTS;
+               err = SBC_ERR_FILE_EXISTS;
        }
        if (!W_ERROR_IS_OK(werr)) {
                DEBUG(5, ("Error creating key %s: %s\n",
-                        subkeyname, dos_errstr(werr)));
+                        subkeyname, win_errstr(werr)));
+               err = SBC_ERR_UNKNOWN_FAILURE;
        }
 
-done:
-       TALLOC_FREE(create_ctx);
-       return werr;
+       talloc_free(create_ctx);
+       return err;
 }
 
 /**
@@ -266,7 +204,7 @@ static WERROR smbconf_reg_set_value(struct registry_key *key,
        if (!strequal(subkeyname, GLOBAL_NAME) &&
            lp_parameter_is_global(valname))
        {
-               DEBUG(5, ("Global paramter '%s' not allowed in "
+               DEBUG(5, ("Global parameter '%s' not allowed in "
                          "service definition ('%s').\n", canon_valname,
                          subkeyname));
                werr = WERR_INVALID_PARAM;
@@ -276,14 +214,16 @@ static WERROR smbconf_reg_set_value(struct registry_key *key,
        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 (!push_reg_sz(talloc_tos(), &val.data, canon_valstr)) {
+               werr = WERR_NOMEM;
+               goto done;
+       }
 
        werr = reg_setvalue(key, canon_valname, &val);
        if (!W_ERROR_IS_OK(werr)) {
                DEBUG(5, ("Error adding value '%s' to "
                          "key '%s': %s\n",
-                         canon_valname, key->key->name, dos_errstr(werr)));
+                         canon_valname, key->key->name, win_errstr(werr)));
        }
 
 done:
@@ -299,39 +239,48 @@ static WERROR smbconf_reg_set_multi_sz_value(struct registry_key *key,
        struct registry_value *value;
        uint32_t count;
        TALLOC_CTX *tmp_ctx = talloc_stackframe();
+       const char **array;
 
        if (strings == NULL) {
                werr = WERR_INVALID_PARAM;
                goto done;
        }
 
-       value = TALLOC_ZERO_P(tmp_ctx, struct registry_value);
+       array = talloc_zero_array(tmp_ctx, const char *, num_strings + 1);
+       if (array == NULL) {
+               werr = WERR_NOMEM;
+               goto done;
+       }
 
-       value->type = REG_MULTI_SZ;
-       value->v.multi_sz.num_strings = num_strings;
-       value->v.multi_sz.strings = TALLOC_ARRAY(tmp_ctx, char *, num_strings);
-       if (value->v.multi_sz.strings == NULL) {
+       value = TALLOC_ZERO_P(tmp_ctx, struct registry_value);
+       if (value == NULL) {
                werr = WERR_NOMEM;
                goto done;
        }
+
+       value->type = REG_MULTI_SZ;
+
        for (count = 0; count < num_strings; count++) {
-               value->v.multi_sz.strings[count] =
-                       talloc_strdup(value->v.multi_sz.strings,
-                                     strings[count]);
-               if (value->v.multi_sz.strings[count] == NULL) {
+               array[count] = talloc_strdup(value, strings[count]);
+               if (array[count] == NULL) {
                        werr = WERR_NOMEM;
                        goto done;
                }
        }
 
+       if (!push_reg_multi_sz(value, &value->data, array)) {
+               werr = WERR_NOMEM;
+               goto done;
+       }
+
        werr = reg_setvalue(key, valname, value);
        if (!W_ERROR_IS_OK(werr)) {
                DEBUG(5, ("Error adding value '%s' to key '%s': %s\n",
-                         valname, key->key->name, dos_errstr(werr)));
+                         valname, key->key->name, win_errstr(werr)));
        }
 
 done:
-       TALLOC_FREE(tmp_ctx);
+       talloc_free(tmp_ctx);
        return werr;
 }
 
@@ -354,18 +303,30 @@ static char *smbconf_format_registry_value(TALLOC_CTX *mem_ctx,
 
        switch (value->type) {
        case REG_DWORD:
-               result = talloc_asprintf(mem_ctx, "%d", value->v.dword);
+               if (value->data.length >= 4) {
+                       uint32_t v = IVAL(value->data.data, 0);
+                       result = talloc_asprintf(mem_ctx, "%d", v);
+               }
                break;
        case REG_SZ:
-       case REG_EXPAND_SZ:
-               result = talloc_asprintf(mem_ctx, "%s", value->v.sz.str);
+       case REG_EXPAND_SZ: {
+               const char *s;
+               if (!pull_reg_sz(mem_ctx, &value->data, &s)) {
+                       break;
+               }
+               result = talloc_strdup(mem_ctx, s);
                break;
+       }
        case REG_MULTI_SZ: {
                uint32 j;
-               for (j = 0; j < value->v.multi_sz.num_strings; j++) {
+               const char **a = NULL;
+               if (!pull_reg_multi_sz(mem_ctx, &value->data, &a)) {
+                       break;
+               }
+               for (j = 0; a[j] != NULL; j++) {
                        result = talloc_asprintf(mem_ctx, "%s\"%s\" ",
                                                 result ? result : "" ,
-                                                value->v.multi_sz.strings[j]);
+                                                a[j]);
                        if (result == NULL) {
                                break;
                        }
@@ -374,7 +335,7 @@ static char *smbconf_format_registry_value(TALLOC_CTX *mem_ctx,
        }
        case REG_BINARY:
                result = talloc_asprintf(mem_ctx, "binary (%d bytes)",
-                                        (int)value->v.binary.length);
+                                        (int)value->data.length);
                break;
        default:
                result = talloc_asprintf(mem_ctx, "<unprintable>");
@@ -389,9 +350,11 @@ static WERROR smbconf_reg_get_includes_internal(TALLOC_CTX *mem_ctx,
                                                char ***includes)
 {
        WERROR werr;
+       sbcErr err;
        uint32_t count;
        struct registry_value *value = NULL;
        char **tmp_includes = NULL;
+       const char **array = NULL;
        TALLOC_CTX *tmp_ctx = talloc_stackframe();
 
        if (!smbconf_value_exists(key, INCLUDES_VALNAME)) {
@@ -408,17 +371,22 @@ static WERROR smbconf_reg_get_includes_internal(TALLOC_CTX *mem_ctx,
        }
 
        if (value->type != REG_MULTI_SZ) {
-               /* wront type -- ignore */
+               /* wrong type -- ignore */
                goto done;
        }
 
-       for (count = 0; count < value->v.multi_sz.num_strings; count++)
-       {
-               werr = smbconf_add_string_to_array(tmp_ctx,
+       if (!pull_reg_multi_sz(tmp_ctx, &value->data, &array)) {
+               werr = WERR_NOMEM;
+               goto done;
+       }
+
+       for (count = 0; array[count] != NULL; count++) {
+               err = smbconf_add_string_to_array(tmp_ctx,
                                        &tmp_includes,
                                        count,
-                                       value->v.multi_sz.strings[count]);
-               if (!W_ERROR_IS_OK(werr)) {
+                                       array[count]);
+               if (!SBC_ERROR_IS_OK(err)) {
+                       werr = WERR_NOMEM;
                        goto done;
                }
        }
@@ -436,7 +404,7 @@ static WERROR smbconf_reg_get_includes_internal(TALLOC_CTX *mem_ctx,
        }
 
 done:
-       TALLOC_FREE(tmp_ctx);
+       talloc_free(tmp_ctx);
        return werr;
 }
 
@@ -452,6 +420,7 @@ static WERROR smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
 {
        TALLOC_CTX *tmp_ctx = NULL;
        WERROR werr = WERR_OK;
+       sbcErr err;
        uint32_t count;
        struct registry_value *valvalue = NULL;
        char *valname = NULL;
@@ -481,17 +450,19 @@ static WERROR smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
                        continue;
                }
 
-               werr = smbconf_add_string_to_array(tmp_ctx,
-                                                  &tmp_valnames,
-                                                  tmp_num_values, valname);
-               if (!W_ERROR_IS_OK(werr)) {
+               err = smbconf_add_string_to_array(tmp_ctx,
+                                                 &tmp_valnames,
+                                                 tmp_num_values, valname);
+               if (!SBC_ERROR_IS_OK(err)) {
+                       werr = WERR_NOMEM;
                        goto done;
                }
 
                valstring = smbconf_format_registry_value(tmp_ctx, valvalue);
-               werr = smbconf_add_string_to_array(tmp_ctx, &tmp_valstrings,
-                                                  tmp_num_values, valstring);
-               if (!W_ERROR_IS_OK(werr)) {
+               err = smbconf_add_string_to_array(tmp_ctx, &tmp_valstrings,
+                                                 tmp_num_values, valstring);
+               if (!SBC_ERROR_IS_OK(err)) {
+                       werr = WERR_NOMEM;
                        goto done;
                }
                tmp_num_values++;
@@ -507,16 +478,18 @@ static WERROR smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
                goto done;
        }
        for (count = 0; count < num_includes; count++) {
-               werr = smbconf_add_string_to_array(tmp_ctx, &tmp_valnames,
-                                                  tmp_num_values, "include");
-               if (!W_ERROR_IS_OK(werr)) {
+               err = smbconf_add_string_to_array(tmp_ctx, &tmp_valnames,
+                                                 tmp_num_values, "include");
+               if (!SBC_ERROR_IS_OK(err)) {
+                       werr = WERR_NOMEM;
                        goto done;
                }
 
-               werr = smbconf_add_string_to_array(tmp_ctx, &tmp_valstrings,
-                                                  tmp_num_values,
-                                                  includes[count]);
-               if (!W_ERROR_IS_OK(werr)) {
+               err = smbconf_add_string_to_array(tmp_ctx, &tmp_valstrings,
+                                                 tmp_num_values,
+                                                 includes[count]);
+               if (!SBC_ERROR_IS_OK(err)) {
+                       werr = WERR_NOMEM;
                        goto done;
                }
 
@@ -533,7 +506,7 @@ static WERROR smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
        }
 
 done:
-       TALLOC_FREE(tmp_ctx);
+       talloc_free(tmp_ctx);
        return werr;
 }
 
@@ -585,14 +558,14 @@ static WERROR smbconf_reg_delete_values(struct registry_key *key)
                DEBUG(1, ("smbconf_reg_delete_values: "
                          "Error enumerating values of %s: %s\n",
                          key->key->name,
-                         dos_errstr(werr)));
+                         win_errstr(werr)));
                goto done;
        }
 
        werr = WERR_OK;
 
 done:
-       TALLOC_FREE(mem_ctx);
+       talloc_free(mem_ctx);
        return werr;
 }
 
@@ -605,9 +578,11 @@ done:
 /**
  * initialize the registry smbconf backend
  */
-static WERROR smbconf_reg_init(struct smbconf_ctx *ctx, const char *path)
+static sbcErr smbconf_reg_init(struct smbconf_ctx *ctx, const char *path)
 {
        WERROR werr = WERR_OK;
+       sbcErr err;
+       struct security_token *token;
 
        if (path == NULL) {
                path = KEY_SMBCONF;
@@ -620,21 +595,36 @@ static WERROR smbconf_reg_init(struct smbconf_ctx *ctx, const char *path)
 
        ctx->data = TALLOC_ZERO_P(ctx, struct reg_private_data);
 
-       werr = ntstatus_to_werror(registry_create_admin_token(ctx,
-                                                       &(rpd(ctx)->token)));
+       werr = ntstatus_to_werror(registry_create_admin_token(ctx, &token));
        if (!W_ERROR_IS_OK(werr)) {
                DEBUG(1, ("Error creating admin token\n"));
+               err = SBC_ERR_UNKNOWN_FAILURE;
                goto done;
        }
        rpd(ctx)->open = false;
 
        werr = registry_init_smbconf(path);
        if (!W_ERROR_IS_OK(werr)) {
+               err = SBC_ERR_BADFILE;
+               goto done;
+       }
+
+       err = ctx->ops->open_conf(ctx);
+       if (!SBC_ERROR_IS_OK(err)) {
+               DEBUG(1, ("Error opening the registry.\n"));
+               goto done;
+       }
+
+       werr = reg_open_path(ctx, ctx->path,
+                            KEY_ENUMERATE_SUB_KEYS | REG_KEY_WRITE,
+                            token, &rpd(ctx)->base_key);
+       if (!W_ERROR_IS_OK(werr)) {
+               err = SBC_ERR_UNKNOWN_FAILURE;
                goto done;
        }
 
 done:
-       return werr;
+       return err;
 }
 
 static int smbconf_reg_shutdown(struct smbconf_ctx *ctx)
@@ -652,19 +642,32 @@ static bool smbconf_reg_requires_messaging(struct smbconf_ctx *ctx)
        return false;
 }
 
-static WERROR smbconf_reg_open(struct smbconf_ctx *ctx)
+static bool smbconf_reg_is_writeable(struct smbconf_ctx *ctx)
+{
+       /*
+        * The backend has write support.
+        *
+        *  TODO: add access checks whether the concrete
+        *  config source is really writeable by the calling user.
+        */
+       return true;
+}
+
+static sbcErr smbconf_reg_open(struct smbconf_ctx *ctx)
 {
        WERROR werr;
 
        if (rpd(ctx)->open) {
-               return WERR_OK;
+               return SBC_ERR_OK;
        }
 
        werr = regdb_open();
-       if (W_ERROR_IS_OK(werr)) {
-               rpd(ctx)->open = true;
+       if (!W_ERROR_IS_OK(werr)) {
+               return SBC_ERR_BADFILE;
        }
-       return werr;
+
+       rpd(ctx)->open = true;
+       return SBC_ERR_OK;
 }
 
 static int smbconf_reg_close(struct smbconf_ctx *ctx)
@@ -694,7 +697,7 @@ static void smbconf_reg_get_csn(struct smbconf_ctx *ctx,
                return;
        }
 
-       if (!W_ERROR_IS_OK(ctx->ops->open_conf(ctx))) {
+       if (!SBC_ERROR_IS_OK(ctx->ops->open_conf(ctx))) {
                return;
        }
 
@@ -704,48 +707,65 @@ static void smbconf_reg_get_csn(struct smbconf_ctx *ctx,
 /**
  * Drop the whole configuration (restarting empty) - registry version
  */
-static WERROR smbconf_reg_drop(struct smbconf_ctx *ctx)
+static sbcErr smbconf_reg_drop(struct smbconf_ctx *ctx)
 {
        char *path, *p;
        WERROR werr = WERR_OK;
+       sbcErr err = SBC_ERR_OK;
        struct registry_key *parent_key = NULL;
        struct registry_key *new_key = NULL;
        TALLOC_CTX* mem_ctx = talloc_stackframe();
        enum winreg_CreateAction action;
+       struct security_token *token;
+
+       werr = ntstatus_to_werror(registry_create_admin_token(ctx, &token));
+       if (!W_ERROR_IS_OK(werr)) {
+               DEBUG(1, ("Error creating admin token\n"));
+               err = SBC_ERR_UNKNOWN_FAILURE;
+               goto done;
+       }
 
        path = talloc_strdup(mem_ctx, ctx->path);
        if (path == NULL) {
-               werr = WERR_NOMEM;
+               err = SBC_ERR_NOMEM;
                goto done;
        }
        p = strrchr(path, '\\');
+       if (p == NULL) {
+               err = SBC_ERR_INVALID_PARAM;
+               goto done;
+       }
        *p = '\0';
-       werr = smbconf_reg_open_path(mem_ctx, ctx, path, REG_KEY_WRITE,
-                                    &parent_key);
-
+       werr = reg_open_path(mem_ctx, path, REG_KEY_WRITE, token,
+                            &parent_key);
        if (!W_ERROR_IS_OK(werr)) {
+               err = SBC_ERR_IO_FAILURE;
                goto done;
        }
 
-       werr = reg_deletekey_recursive(mem_ctx, parent_key, p+1);
-
+       werr = reg_deletekey_recursive(parent_key, p+1);
        if (!W_ERROR_IS_OK(werr)) {
+               err = SBC_ERR_IO_FAILURE;
                goto done;
        }
 
        werr = reg_createkey(mem_ctx, parent_key, p+1, REG_KEY_WRITE,
                             &new_key, &action);
+       if (!W_ERROR_IS_OK(werr)) {
+               err = SBC_ERR_IO_FAILURE;
+               goto done;
+       }
 
 done:
-       TALLOC_FREE(mem_ctx);
-       return werr;
+       talloc_free(mem_ctx);
+       return err;
 }
 
 /**
  * get the list of share names defined in the configuration.
  * registry version.
  */
-static WERROR smbconf_reg_get_share_names(struct smbconf_ctx *ctx,
+static sbcErr smbconf_reg_get_share_names(struct smbconf_ctx *ctx,
                                          TALLOC_CTX *mem_ctx,
                                          uint32_t *num_shares,
                                          char ***share_names)
@@ -753,29 +773,23 @@ static WERROR smbconf_reg_get_share_names(struct smbconf_ctx *ctx,
        uint32_t count;
        uint32_t added_count = 0;
        TALLOC_CTX *tmp_ctx = NULL;
-       WERROR werr = WERR_OK;
-       struct registry_key *key = NULL;
+       WERROR werr;
+       sbcErr err = SBC_ERR_OK;
        char *subkey_name = NULL;
        char **tmp_share_names = NULL;
 
        if ((num_shares == NULL) || (share_names == NULL)) {
-               werr = WERR_INVALID_PARAM;
-               goto done;
+               return SBC_ERR_INVALID_PARAM;
        }
 
        tmp_ctx = talloc_stackframe();
 
        /* if there are values in the base key, return NULL as share name */
-       werr = smbconf_reg_open_base_key(tmp_ctx, ctx,
-                                        SEC_RIGHTS_ENUM_SUBKEYS, &key);
-       if (!W_ERROR_IS_OK(werr)) {
-               goto done;
-       }
 
-       if (smbconf_reg_key_has_values(key)) {
-               werr = smbconf_add_string_to_array(tmp_ctx, &tmp_share_names,
+       if (smbconf_reg_key_has_values(rpd(ctx)->base_key)) {
+               err = smbconf_add_string_to_array(tmp_ctx, &tmp_share_names,
                                                   0, NULL);
-               if (!W_ERROR_IS_OK(werr)) {
+               if (!SBC_ERROR_IS_OK(err)) {
                        goto done;
                }
                added_count++;
@@ -783,16 +797,17 @@ static WERROR smbconf_reg_get_share_names(struct smbconf_ctx *ctx,
 
        /* make sure "global" is always listed first */
        if (smbconf_share_exists(ctx, GLOBAL_NAME)) {
-               werr = smbconf_add_string_to_array(tmp_ctx, &tmp_share_names,
-                                                  added_count, GLOBAL_NAME);
-               if (!W_ERROR_IS_OK(werr)) {
+               err = smbconf_add_string_to_array(tmp_ctx, &tmp_share_names,
+                                                 added_count, GLOBAL_NAME);
+               if (!SBC_ERROR_IS_OK(err)) {
                        goto done;
                }
                added_count++;
        }
 
        for (count = 0;
-            werr = reg_enumkey(tmp_ctx, key, count, &subkey_name, NULL),
+            werr = reg_enumkey(tmp_ctx, rpd(ctx)->base_key, count,
+                               &subkey_name, NULL),
             W_ERROR_IS_OK(werr);
             count++)
        {
@@ -800,19 +815,20 @@ static WERROR smbconf_reg_get_share_names(struct smbconf_ctx *ctx,
                        continue;
                }
 
-               werr = smbconf_add_string_to_array(tmp_ctx,
+               err = smbconf_add_string_to_array(tmp_ctx,
                                                   &tmp_share_names,
                                                   added_count,
                                                   subkey_name);
-               if (!W_ERROR_IS_OK(werr)) {
+               if (!SBC_ERROR_IS_OK(err)) {
                        goto done;
                }
                added_count++;
        }
        if (!W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, werr)) {
+               err = SBC_ERR_NO_MORE_ITEMS;
                goto done;
        }
-       werr = WERR_OK;
+       err = SBC_ERR_OK;
 
        *num_shares = added_count;
        if (added_count > 0) {
@@ -822,8 +838,8 @@ static WERROR smbconf_reg_get_share_names(struct smbconf_ctx *ctx,
        }
 
 done:
-       TALLOC_FREE(tmp_ctx);
-       return werr;
+       talloc_free(tmp_ctx);
+       return err;
 }
 
 /**
@@ -843,30 +859,28 @@ static bool smbconf_reg_share_exists(struct smbconf_ctx *ctx,
                ret = true;
        }
 
-       TALLOC_FREE(mem_ctx);
+       talloc_free(mem_ctx);
        return ret;
 }
 
 /**
  * Add a service if it does not already exist - registry version
  */
-static WERROR smbconf_reg_create_share(struct smbconf_ctx *ctx,
+static sbcErr smbconf_reg_create_share(struct smbconf_ctx *ctx,
                                       const char *servicename)
 {
-       WERROR werr;
-       TALLOC_CTX *mem_ctx = talloc_stackframe();
+       sbcErr err;
        struct registry_key *key = NULL;
 
        if (servicename == NULL) {
-               werr = smbconf_reg_open_base_key(mem_ctx, ctx, REG_KEY_WRITE,
-                                                &key);
-       } else {
-               werr = smbconf_reg_create_service_key(mem_ctx, ctx,
-                                                     servicename, &key);
+               return SBC_ERR_OK;
        }
 
-       TALLOC_FREE(mem_ctx);
-       return werr;
+       err = smbconf_reg_create_service_key(talloc_tos(), ctx,
+                                            servicename, &key);
+
+       talloc_free(key);
+       return err;
 }
 
 /**
@@ -912,7 +926,7 @@ static WERROR smbconf_reg_get_share(struct smbconf_ctx *ctx,
        }
 
 done:
-       TALLOC_FREE(tmp_ctx);
+       talloc_free(tmp_ctx);
        return werr;
 }
 
@@ -923,22 +937,15 @@ static WERROR smbconf_reg_delete_share(struct smbconf_ctx *ctx,
                                       const char *servicename)
 {
        WERROR werr = WERR_OK;
-       struct registry_key *key = NULL;
        TALLOC_CTX *mem_ctx = talloc_stackframe();
 
-       werr = smbconf_reg_open_base_key(mem_ctx, ctx, REG_KEY_WRITE, &key);
-       if (!W_ERROR_IS_OK(werr)) {
-               goto done;
-       }
-
        if (servicename != NULL) {
-               werr = reg_deletekey_recursive(key, key, servicename);
+               werr = reg_deletekey_recursive(rpd(ctx)->base_key, servicename);
        } else {
-               werr = smbconf_reg_delete_values(key);
+               werr = smbconf_reg_delete_values(rpd(ctx)->base_key);
        }
 
-done:
-       TALLOC_FREE(mem_ctx);
+       talloc_free(mem_ctx);
        return werr;
 }
 
@@ -963,7 +970,7 @@ static WERROR smbconf_reg_set_parameter(struct smbconf_ctx *ctx,
        werr = smbconf_reg_set_value(key, param, valstr);
 
 done:
-       TALLOC_FREE(mem_ctx);
+       talloc_free(mem_ctx);
        return werr;
 }
 
@@ -1008,8 +1015,8 @@ static WERROR smbconf_reg_get_parameter(struct smbconf_ctx *ctx,
        }
 
 done:
-       TALLOC_FREE(key);
-       TALLOC_FREE(value);
+       talloc_free(key);
+       talloc_free(value);
        return werr;
 }
 
@@ -1043,7 +1050,7 @@ static WERROR smbconf_reg_delete_parameter(struct smbconf_ctx *ctx,
        werr = reg_deletevalue(key, param);
 
 done:
-       TALLOC_FREE(mem_ctx);
+       talloc_free(mem_ctx);
        return werr;
 }
 
@@ -1067,7 +1074,7 @@ static WERROR smbconf_reg_get_includes(struct smbconf_ctx *ctx,
                                                 includes);
 
 done:
-       TALLOC_FREE(tmp_ctx);
+       talloc_free(tmp_ctx);
        return werr;
 }
 
@@ -1097,7 +1104,7 @@ static WERROR smbconf_reg_set_includes(struct smbconf_ctx *ctx,
        }
 
 done:
-       TALLOC_FREE(tmp_ctx);
+       talloc_free(tmp_ctx);
        return werr;
 }
 
@@ -1122,14 +1129,30 @@ static WERROR smbconf_reg_delete_includes(struct smbconf_ctx *ctx,
 
 
 done:
-       TALLOC_FREE(tmp_ctx);
+       talloc_free(tmp_ctx);
        return werr;
 }
 
+static WERROR smbconf_reg_transaction_start(struct smbconf_ctx *ctx)
+{
+       return regdb_transaction_start();
+}
+
+static WERROR smbconf_reg_transaction_commit(struct smbconf_ctx *ctx)
+{
+       return regdb_transaction_commit();
+}
+
+static WERROR smbconf_reg_transaction_cancel(struct smbconf_ctx *ctx)
+{
+       return regdb_transaction_cancel();
+}
+
 struct smbconf_ops smbconf_ops_reg = {
        .init                   = smbconf_reg_init,
        .shutdown               = smbconf_reg_shutdown,
        .requires_messaging     = smbconf_reg_requires_messaging,
+       .is_writeable           = smbconf_reg_is_writeable,
        .open_conf              = smbconf_reg_open,
        .close_conf             = smbconf_reg_close,
        .get_csn                = smbconf_reg_get_csn,
@@ -1145,6 +1168,9 @@ struct smbconf_ops smbconf_ops_reg = {
        .get_includes           = smbconf_reg_get_includes,
        .set_includes           = smbconf_reg_set_includes,
        .delete_includes        = smbconf_reg_delete_includes,
+       .transaction_start      = smbconf_reg_transaction_start,
+       .transaction_commit     = smbconf_reg_transaction_commit,
+       .transaction_cancel     = smbconf_reg_transaction_cancel,
 };
 
 
@@ -1152,7 +1178,7 @@ struct smbconf_ops smbconf_ops_reg = {
  * initialize the smbconf registry backend
  * the only function that is exported from this module
  */
-WERROR smbconf_init_reg(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
+sbcErr smbconf_init_reg(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx,
                        const char *path)
 {
        return smbconf_init_internal(mem_ctx, conf_ctx, path, &smbconf_ops_reg);