libsmbconf: Convert smbconf_drop() to sbcErr.

Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 1ed47a5889a84deb6422b3ed9c7fd5928d171827)

diff --git a/smbconf/smbconf.c b/smbconf/smbconf.c
index 5fbf52da05098bd070018e97cbc5c7068d528011..366b78dd6ec0ec21ba5d3717b8f5eae09491d9f6 100644 (file)
--- a/smbconf/smbconf.c
+++ b/smbconf/smbconf.c
@@ -126,7 +126,7 @@ bool smbconf_changed(struct smbconf_ctx *ctx, struct smbconf_csn *csn,
 /**
  * Drop the whole configuration (restarting empty).
  */
-WERROR smbconf_drop(struct smbconf_ctx *ctx)
+sbcErr smbconf_drop(struct smbconf_ctx *ctx)
 {
        return ctx->ops->drop(ctx);
 }

diff --git a/smbconf/smbconf.h b/smbconf/smbconf.h
index 11e971b5bad91880215aacc0746455483a0b81e1..535582565abaddefd6aacc3f2dfc24b42ff211e8 100644 (file)
--- a/smbconf/smbconf.h
+++ b/smbconf/smbconf.h
@@ -74,7 +74,7 @@ bool smbconf_is_writeable(struct smbconf_ctx *ctx);
 void smbconf_shutdown(struct smbconf_ctx *ctx);
 bool smbconf_changed(struct smbconf_ctx *ctx, struct smbconf_csn *csn,
                     const char *service, const char *param);
-WERROR smbconf_drop(struct smbconf_ctx *ctx);
+sbcErr smbconf_drop(struct smbconf_ctx *ctx);
 WERROR smbconf_get_config(struct smbconf_ctx *ctx,
                          TALLOC_CTX *mem_ctx,
                          uint32_t *num_shares,

diff --git a/smbconf/smbconf_private.h b/smbconf/smbconf_private.h
index 26573274ee2df6c9bb4649a3768734eaeba87fc6..3d68a05c343fea4cef5ca80453d3bc036b09760c 100644 (file)
--- a/smbconf/smbconf_private.h
+++ b/smbconf/smbconf_private.h
@@ -35,7 +35,7 @@ struct smbconf_ops {
        int (*close_conf)(struct smbconf_ctx *ctx);
        void (*get_csn)(struct smbconf_ctx *ctx, struct smbconf_csn *csn,
                        const char *service, const char *param);
-       WERROR (*drop)(struct smbconf_ctx *ctx);
+       sbcErr (*drop)(struct smbconf_ctx *ctx);
        WERROR (*get_share_names)(struct smbconf_ctx *ctx,
                                  TALLOC_CTX *mem_ctx,
                                  uint32_t *num_shares,

diff --git a/smbconf/smbconf_txt.c b/smbconf/smbconf_txt.c
index 1ee855c641324e75bae9b69d082521a814a7b0dc..4b16cc23aaa54e9ea43c2941be7968636eff5ef9 100644 (file)
--- a/smbconf/smbconf_txt.c
+++ b/smbconf/smbconf_txt.c
@@ -285,9 +285,9 @@ static void smbconf_txt_get_csn(struct smbconf_ctx *ctx,
 /**
  * Drop the whole configuration (restarting empty)
  */
-static WERROR smbconf_txt_drop(struct smbconf_ctx *ctx)
+static sbcErr smbconf_txt_drop(struct smbconf_ctx *ctx)
 {
-       return WERR_NOT_SUPPORTED;
+       return SBC_ERR_NOT_SUPPORTED;
 }
 
 /**