diff options
| author | Andreas Schneider <asn@samba.org> | 2011-04-11 14:52:52 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-05-10 19:13:21 +0200 |
| commit | 9f9711490ae743493722c997e316a31600ef02d6 (patch) | |
| tree | a99b9b9e28f129fcf9e74e0a0d2b5b969c389e8c /lib/smbconf/smbconf.c | |
| parent | e19c4f278b5467327df7a90256802382c7999414 (diff) | |
| download | samba-9f9711490ae743493722c997e316a31600ef02d6.tar.gz samba-9f9711490ae743493722c997e316a31600ef02d6.tar.bz2 samba-9f9711490ae743493722c997e316a31600ef02d6.zip | |
libsmbconf: Convert smbconf_get_includes() to sbcErr.
Signed-off-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'lib/smbconf/smbconf.c')
| -rw-r--r-- | lib/smbconf/smbconf.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c index a6bb64fec8..f23a802e7c 100644 --- a/lib/smbconf/smbconf.c +++ b/lib/smbconf/smbconf.c @@ -355,7 +355,7 @@ sbcErr smbconf_delete_global_parameter(struct smbconf_ctx *ctx, return err; } -WERROR smbconf_get_includes(struct smbconf_ctx *ctx, +sbcErr smbconf_get_includes(struct smbconf_ctx *ctx, TALLOC_CTX *mem_ctx, const char *service, uint32_t *num_includes, char ***includes) @@ -364,21 +364,20 @@ WERROR smbconf_get_includes(struct smbconf_ctx *ctx, includes); } -WERROR smbconf_get_global_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 werr; sbcErr err; err = smbconf_global_check(ctx); - if (SBC_ERROR_IS_OK(err)) { - return WERR_GENERAL_FAILURE; + if (!SBC_ERROR_IS_OK(err)) { + return err; } - werr = smbconf_get_includes(ctx, mem_ctx, GLOBAL_NAME, + err = smbconf_get_includes(ctx, mem_ctx, GLOBAL_NAME, num_includes, includes); - return werr; + return err; } WERROR smbconf_set_includes(struct smbconf_ctx *ctx, |