libsmbconf: Convert smbconf_transaction_*() to sbcErr.

Signed-off-by: Michael Adam <obnox@samba.org>

diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c
index 54aaa22f6e51136c8d592608cfca797197c01f37..c81af36cdbdf5674f22ab49ad7aeab40377d0d2d 100644 (file)
--- a/lib/smbconf/smbconf.c
+++ b/lib/smbconf/smbconf.c
@@ -422,17 +422,17 @@ sbcErr smbconf_delete_global_includes(struct smbconf_ctx *ctx)
        return err;
 }
 
-WERROR smbconf_transaction_start(struct smbconf_ctx *ctx)
+sbcErr smbconf_transaction_start(struct smbconf_ctx *ctx)
 {
        return ctx->ops->transaction_start(ctx);
 }
 
-WERROR smbconf_transaction_commit(struct smbconf_ctx *ctx)
+sbcErr smbconf_transaction_commit(struct smbconf_ctx *ctx)
 {
        return ctx->ops->transaction_commit(ctx);
 }
 
-WERROR smbconf_transaction_cancel(struct smbconf_ctx *ctx)
+sbcErr smbconf_transaction_cancel(struct smbconf_ctx *ctx)
 {
        return ctx->ops->transaction_cancel(ctx);
 }

diff --git a/lib/smbconf/smbconf.h b/lib/smbconf/smbconf.h
index 798db5b423545bd8a16a8cb1d6eec59a89057641..f5dd922ed165e25170531a6afb09bebc1d804d8a 100644 (file)
--- a/lib/smbconf/smbconf.h
+++ b/lib/smbconf/smbconf.h
@@ -127,8 +127,8 @@ sbcErr smbconf_set_global_includes(struct smbconf_ctx *ctx,
 sbcErr smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service);
 sbcErr smbconf_delete_global_includes(struct smbconf_ctx *ctx);
 
-WERROR smbconf_transaction_start(struct smbconf_ctx *ctx);
-WERROR smbconf_transaction_commit(struct smbconf_ctx *ctx);
-WERROR smbconf_transaction_cancel(struct smbconf_ctx *ctx);
+sbcErr smbconf_transaction_start(struct smbconf_ctx *ctx);
+sbcErr smbconf_transaction_commit(struct smbconf_ctx *ctx);
+sbcErr smbconf_transaction_cancel(struct smbconf_ctx *ctx);
 
 #endif /*  _LIBSMBCONF_H_  */

diff --git a/lib/smbconf/smbconf_private.h b/lib/smbconf/smbconf_private.h
index 6672a50de19e8d905638206d82b37313d725da72..e768c30b91eb6cc7e685ad72156ae0fa0457732d 100644 (file)
--- a/lib/smbconf/smbconf_private.h
+++ b/lib/smbconf/smbconf_private.h
@@ -68,9 +68,9 @@ struct smbconf_ops {
                               uint32_t num_includes, const char **includes);
        sbcErr (*delete_includes)(struct smbconf_ctx *ctx,
                                  const char *service);
-       WERROR (*transaction_start)(struct smbconf_ctx *ctx);
-       WERROR (*transaction_commit)(struct smbconf_ctx *ctx);
-       WERROR (*transaction_cancel)(struct smbconf_ctx *ctx);
+       sbcErr (*transaction_start)(struct smbconf_ctx *ctx);
+       sbcErr (*transaction_commit)(struct smbconf_ctx *ctx);
+       sbcErr (*transaction_cancel)(struct smbconf_ctx *ctx);
 };
 
 struct smbconf_ctx {

diff --git a/lib/smbconf/smbconf_txt.c b/lib/smbconf/smbconf_txt.c
index f6194db518a5cbf7a280bfa5d5c167ae19b3a54a..5c4bd27b9df06d3f719ad2871241e6ec64dd6adb 100644 (file)
--- a/lib/smbconf/smbconf_txt.c
+++ b/lib/smbconf/smbconf_txt.c
@@ -608,19 +608,19 @@ static sbcErr smbconf_txt_delete_includes(struct smbconf_ctx *ctx,
        return SBC_ERR_NOT_SUPPORTED;
 }
 
-static WERROR smbconf_txt_transaction_start(struct smbconf_ctx *ctx)
+static sbcErr smbconf_txt_transaction_start(struct smbconf_ctx *ctx)
 {
-       return WERR_OK;
+       return SBC_ERR_OK;
 }
 
-static WERROR smbconf_txt_transaction_commit(struct smbconf_ctx *ctx)
+static sbcErr smbconf_txt_transaction_commit(struct smbconf_ctx *ctx)
 {
-       return WERR_OK;
+       return SBC_ERR_OK;
 }
 
-static WERROR smbconf_txt_transaction_cancel(struct smbconf_ctx *ctx)
+static sbcErr smbconf_txt_transaction_cancel(struct smbconf_ctx *ctx)
 {
-       return WERR_OK;
+       return SBC_ERR_OK;
 }
 
 static struct smbconf_ops smbconf_ops_txt = {

diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c
index eb6db29f5ce730450387694dbf87ea68cd28d8b1..6982795c73d1a509c8c67af6cb70ea6151fc551c 100644 (file)
--- a/source3/lib/smbconf/smbconf_reg.c
+++ b/source3/lib/smbconf/smbconf_reg.c
@@ -1167,19 +1167,40 @@ done:
        return err;
 }
 
-static WERROR smbconf_reg_transaction_start(struct smbconf_ctx *ctx)
+static sbcErr smbconf_reg_transaction_start(struct smbconf_ctx *ctx)
 {
-       return regdb_transaction_start();
+       WERROR werr;
+
+       werr = regdb_transaction_start();
+       if (!W_ERROR_IS_OK(werr)) {
+               return SBC_ERR_IO_FAILURE;
+       }
+
+       return SBC_ERR_OK;
 }
 
-static WERROR smbconf_reg_transaction_commit(struct smbconf_ctx *ctx)
+static sbcErr smbconf_reg_transaction_commit(struct smbconf_ctx *ctx)
 {
-       return regdb_transaction_commit();
+       WERROR werr;
+
+       werr = regdb_transaction_commit();
+       if (!W_ERROR_IS_OK(werr)) {
+               return SBC_ERR_IO_FAILURE;
+       }
+
+       return SBC_ERR_OK;
 }
 
-static WERROR smbconf_reg_transaction_cancel(struct smbconf_ctx *ctx)
+static sbcErr smbconf_reg_transaction_cancel(struct smbconf_ctx *ctx)
 {
-       return regdb_transaction_cancel();
+       WERROR werr;
+
+       werr = regdb_transaction_cancel();
+       if (!W_ERROR_IS_OK(werr)) {
+               return SBC_ERR_IO_FAILURE;
+       }
+
+       return SBC_ERR_OK;
 }
 
 struct smbconf_ops smbconf_ops_reg = {

diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 2d7fb7bbb4d1684fe555df407ef4261aabbd7c12..7ca58ee2d53df25858d66bba48e41707a5db73ec 100644 (file)
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -380,8 +380,8 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
                        goto cancel;
                }
 
-               werr = smbconf_transaction_start(conf_ctx);
-               if (!W_ERROR_IS_OK(werr)) {
+               err = smbconf_transaction_start(conf_ctx);
+               if (!SBC_ERROR_IS_OK(err)) {
                        d_printf(_("error starting transaction: %s\n"),
                                 win_errstr(werr));
                        goto done;
@@ -415,10 +415,10 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
                 * imported shares, the MAX_TALLOC_SIZE of 256 MB
                 * was exceeded.
                 */
-               werr = smbconf_transaction_start(conf_ctx);
-               if (!W_ERROR_IS_OK(werr)) {
+               err = smbconf_transaction_start(conf_ctx);
+               if (!SBC_ERROR_IS_OK(err)) {
                        d_printf(_("error starting transaction: %s\n"),
-                                win_errstr(werr));
+                                sbcErrorString(err));
                        goto done;
                }
 
@@ -433,26 +433,26 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
                                continue;
                        }
 
-                       werr = smbconf_transaction_commit(conf_ctx);
-                       if (!W_ERROR_IS_OK(werr)) {
+                       err = smbconf_transaction_commit(conf_ctx);
+                       if (!SBC_ERROR_IS_OK(err)) {
                                d_printf(_("error committing transaction: "
                                           "%s\n"),
-                                        win_errstr(werr));
+                                        sbcErrorString(err));
                                goto done;
                        }
-                       werr = smbconf_transaction_start(conf_ctx);
-                       if (!W_ERROR_IS_OK(werr)) {
+                       err = smbconf_transaction_start(conf_ctx);
+                       if (!SBC_ERROR_IS_OK(err)) {
                                d_printf(_("error starting transaction: %s\n"),
-                                        win_errstr(werr));
+                                        sbcErrorString(err));
                                goto done;
                        }
                }
        }
 
-       werr = smbconf_transaction_commit(conf_ctx);
-       if (!W_ERROR_IS_OK(werr)) {
+       err = smbconf_transaction_commit(conf_ctx);
+       if (!SBC_ERROR_IS_OK(err)) {
                d_printf(_("error committing transaction: %s\n"),
-                        win_errstr(werr));
+                        sbcErrorString(err));
        } else {
                ret = 0;
        }
@@ -460,10 +460,10 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
        goto done;
 
 cancel:
-       werr = smbconf_transaction_cancel(conf_ctx);
-       if (!W_ERROR_IS_OK(werr)) {
+       err = smbconf_transaction_cancel(conf_ctx);
+       if (!SBC_ERROR_IS_OK(err)) {
                d_printf(_("error cancelling transaction: %s\n"),
-                        win_errstr(werr));
+                        sbcErrorString(err));
        }
 
 done:
@@ -586,7 +586,6 @@ static int net_conf_addshare(struct net_context *c,
                             const char **argv)
 {
        int ret = -1;
-       WERROR werr = WERR_OK;
        sbcErr err;
        char *sharename = NULL;
        const char *path = NULL;
@@ -713,10 +712,10 @@ static int net_conf_addshare(struct net_context *c,
         * start a transaction
         */
 
-       werr = smbconf_transaction_start(conf_ctx);
-       if (!W_ERROR_IS_OK(werr)) {
+       err = smbconf_transaction_start(conf_ctx);
+       if (!SBC_ERROR_IS_OK(err)) {
                d_printf("error starting transaction: %s\n",
-                        win_errstr(werr));
+                        sbcErrorString(err));
                goto done;
        }
 
@@ -771,10 +770,10 @@ static int net_conf_addshare(struct net_context *c,
         * commit the whole thing
         */
 
-       werr = smbconf_transaction_commit(conf_ctx);
-       if (!W_ERROR_IS_OK(werr)) {
+       err = smbconf_transaction_commit(conf_ctx);
+       if (!SBC_ERROR_IS_OK(err)) {
                d_printf("error committing transaction: %s\n",
-                        win_errstr(werr));
+                        sbcErrorString(err));
        } else {
                ret = 0;
        }
@@ -782,10 +781,10 @@ static int net_conf_addshare(struct net_context *c,
        goto done;
 
 cancel:
-       werr = smbconf_transaction_cancel(conf_ctx);
-       if (!W_ERROR_IS_OK(werr)) {
+       err = smbconf_transaction_cancel(conf_ctx);
+       if (!SBC_ERROR_IS_OK(err)) {
                d_printf("error cancelling transaction: %s\n",
-                        win_errstr(werr));
+                        sbcErrorString(err));
        }
 
 done:
@@ -829,7 +828,6 @@ static int net_conf_setparm(struct net_context *c, struct smbconf_ctx *conf_ctx,
                            int argc, const char **argv)
 {
        int ret = -1;
-       WERROR werr = WERR_OK;
        sbcErr err;
        char *service = NULL;
        char *param = NULL;
@@ -858,10 +856,10 @@ static int net_conf_setparm(struct net_context *c, struct smbconf_ctx *conf_ctx,
        }
        value_str = argv[2];
 
-       werr = smbconf_transaction_start(conf_ctx);
-       if (!W_ERROR_IS_OK(werr)) {
+       err = smbconf_transaction_start(conf_ctx);
+       if (!SBC_ERROR_IS_OK(err)) {
                d_printf(_("error starting transaction: %s\n"),
-                        win_errstr(werr));
+                        sbcErrorString(err));
                goto done;
        }
 
@@ -881,10 +879,10 @@ static int net_conf_setparm(struct net_context *c, struct smbconf_ctx *conf_ctx,
                goto cancel;
        }
 
-       werr = smbconf_transaction_commit(conf_ctx);
-       if (!W_ERROR_IS_OK(werr)) {
+       err = smbconf_transaction_commit(conf_ctx);
+       if (!SBC_ERROR_IS_OK(err)) {
                d_printf(_("error committing transaction: %s\n"),
-                        win_errstr(werr));
+                        sbcErrorString(err));
        } else {
                ret = 0;
        }
@@ -892,10 +890,10 @@ static int net_conf_setparm(struct net_context *c, struct smbconf_ctx *conf_ctx,
        goto done;
 
 cancel:
-       werr = smbconf_transaction_cancel(conf_ctx);
-       if (!W_ERROR_IS_OK(werr)) {
+       err = smbconf_transaction_cancel(conf_ctx);
+       if (!SBC_ERROR_IS_OK(err)) {
                d_printf(_("error cancelling transaction: %s\n"),
-                        win_errstr(werr));
+                        sbcErrorString(err));
        }
 
 done: