diff options
| author | Andreas Schneider <asn@samba.org> | 2011-04-11 15:14:52 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-05-10 19:13:22 +0200 |
| commit | d911bafea695dc36d7952bd265dfe15a3e04ac7b (patch) | |
| tree | cd30e1c56152f40de4340ab4e893970859d07ad4 /lib | |
| parent | 9f9711490ae743493722c997e316a31600ef02d6 (diff) | |
| download | samba-d911bafea695dc36d7952bd265dfe15a3e04ac7b.tar.gz samba-d911bafea695dc36d7952bd265dfe15a3e04ac7b.tar.bz2 samba-d911bafea695dc36d7952bd265dfe15a3e04ac7b.zip | |
libsmbconf: Convert smbconf_set_includes() to sbcErr.
Signed-off-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/smbconf/smbconf.c | 13 | ||||
| -rw-r--r-- | lib/smbconf/smbconf.h | 4 | ||||
| -rw-r--r-- | lib/smbconf/smbconf_private.h | 2 | ||||
| -rw-r--r-- | lib/smbconf/smbconf_txt.c | 4 |
4 files changed, 11 insertions, 12 deletions
diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c index f23a802e7c..c3ba106d1c 100644 --- a/lib/smbconf/smbconf.c +++ b/lib/smbconf/smbconf.c @@ -380,28 +380,27 @@ sbcErr smbconf_get_global_includes(struct smbconf_ctx *ctx, return err; } -WERROR smbconf_set_includes(struct smbconf_ctx *ctx, +sbcErr smbconf_set_includes(struct smbconf_ctx *ctx, const char *service, uint32_t num_includes, const char **includes) { return ctx->ops->set_includes(ctx, service, num_includes, includes); } -WERROR smbconf_set_global_includes(struct smbconf_ctx *ctx, +sbcErr smbconf_set_global_includes(struct smbconf_ctx *ctx, uint32_t num_includes, const char **includes) { - WERROR werr; sbcErr err; err = smbconf_global_check(ctx); if (!SBC_ERROR_IS_OK(err)) { - return WERR_GENERAL_FAILURE; + return err; } - werr = smbconf_set_includes(ctx, GLOBAL_NAME, - num_includes, includes); + err = smbconf_set_includes(ctx, GLOBAL_NAME, + num_includes, includes); - return werr; + return err; } diff --git a/lib/smbconf/smbconf.h b/lib/smbconf/smbconf.h index 672c256480..8921af4108 100644 --- a/lib/smbconf/smbconf.h +++ b/lib/smbconf/smbconf.h @@ -118,10 +118,10 @@ sbcErr smbconf_get_includes(struct smbconf_ctx *ctx, sbcErr smbconf_get_global_includes(struct smbconf_ctx *ctx, TALLOC_CTX *mem_ctx, uint32_t *num_includes, char ***includes); -WERROR smbconf_set_includes(struct smbconf_ctx *ctx, +sbcErr smbconf_set_includes(struct smbconf_ctx *ctx, const char *service, uint32_t num_includes, const char **includes); -WERROR smbconf_set_global_includes(struct smbconf_ctx *ctx, +sbcErr smbconf_set_global_includes(struct smbconf_ctx *ctx, uint32_t num_includes, const char **includes); WERROR smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service); diff --git a/lib/smbconf/smbconf_private.h b/lib/smbconf/smbconf_private.h index 8fb9c84921..1cb8b88d13 100644 --- a/lib/smbconf/smbconf_private.h +++ b/lib/smbconf/smbconf_private.h @@ -63,7 +63,7 @@ struct smbconf_ops { TALLOC_CTX *mem_ctx, const char *service, uint32_t *num_includes, char ***includes); - WERROR (*set_includes)(struct smbconf_ctx *ctx, + sbcErr (*set_includes)(struct smbconf_ctx *ctx, const char *service, uint32_t num_includes, const char **includes); WERROR (*delete_includes)(struct smbconf_ctx *ctx, diff --git a/lib/smbconf/smbconf_txt.c b/lib/smbconf/smbconf_txt.c index 7983d925e6..5502167593 100644 --- a/lib/smbconf/smbconf_txt.c +++ b/lib/smbconf/smbconf_txt.c @@ -594,12 +594,12 @@ done: return err; } -static WERROR smbconf_txt_set_includes(struct smbconf_ctx *ctx, +static sbcErr smbconf_txt_set_includes(struct smbconf_ctx *ctx, const char *service, uint32_t num_includes, const char **includes) { - return WERR_NOT_SUPPORTED; + return SBC_ERR_NOT_SUPPORTED; } static WERROR smbconf_txt_delete_includes(struct smbconf_ctx *ctx, |