Merge branch 'master' of git://git.samba.org/samba into teventfix

[samba.git] / lib / smbconf / smbconf.c

diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c
index d723f0b1408e25493d49d656606d1adb3b0d7ae0..f25ccae0d41c9f819bb8256ec3824e904ff41dcd 100644 (file)
--- a/lib/smbconf/smbconf.c
+++ b/lib/smbconf/smbconf.c
@@ -130,7 +130,7 @@ WERROR smbconf_get_config(struct smbconf_ctx *ctx,
                goto done;
        }
 
-       tmp_services = TALLOC_ARRAY(tmp_ctx, struct smbconf_service *,
+       tmp_services = talloc_array(tmp_ctx, struct smbconf_service *,
                                    tmp_num_shares);
 
        if (tmp_services == NULL) {
@@ -203,10 +203,6 @@ WERROR smbconf_get_share(struct smbconf_ctx *ctx,
                         const char *servicename,
                         struct smbconf_service **service)
 {
-       if (!smbconf_share_exists(ctx, servicename)) {
-               return WERR_NO_SUCH_SERVICE;
-       }
-
        return ctx->ops->get_share(ctx, mem_ctx, servicename, service);
 }
 
@@ -403,3 +399,18 @@ WERROR smbconf_delete_global_includes(struct smbconf_ctx *ctx)
 
        return werr;
 }
+
+WERROR smbconf_transaction_start(struct smbconf_ctx *ctx)
+{
+       return ctx->ops->transaction_start(ctx);
+}
+
+WERROR smbconf_transaction_commit(struct smbconf_ctx *ctx)
+{
+       return ctx->ops->transaction_commit(ctx);
+}
+
+WERROR smbconf_transaction_cancel(struct smbconf_ctx *ctx)
+{
+       return ctx->ops->transaction_cancel(ctx);
+}