Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16

[gd/samba-autobuild/.git] / lib / smbconf / smbconf.c

diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c
index 02c49cc877dbb885fb56b01c5f6b3513cea56fc0..e0441ed9857f1d09bf4ca69a95b416d8ce5535a2 100644 (file)
--- a/lib/smbconf/smbconf.c
+++ b/lib/smbconf/smbconf.c
@@ -141,12 +141,11 @@ sbcErr smbconf_drop(struct smbconf_ctx *ctx)
  *  param_names  : list of lists of parameter names for each share
  *  param_values : list of lists of parameter values for each share
  */
-WERROR smbconf_get_config(struct smbconf_ctx *ctx,
+sbcErr smbconf_get_config(struct smbconf_ctx *ctx,
                          TALLOC_CTX *mem_ctx,
                          uint32_t *num_shares,
                          struct smbconf_service ***services)
 {
-       WERROR werr = WERR_OK;
        sbcErr err;
        TALLOC_CTX *tmp_ctx = NULL;
        uint32_t tmp_num_shares;
@@ -155,7 +154,7 @@ WERROR smbconf_get_config(struct smbconf_ctx *ctx,
        uint32_t count;
 
        if ((num_shares == NULL) || (services == NULL)) {
-               werr = WERR_INVALID_PARAM;
+               err = SBC_ERR_INVALID_PARAM;
                goto done;
        }
 
@@ -164,15 +163,13 @@ WERROR smbconf_get_config(struct smbconf_ctx *ctx,
        err = smbconf_get_share_names(ctx, tmp_ctx, &tmp_num_shares,
                                      &tmp_share_names);
        if (!SBC_ERROR_IS_OK(err)) {
-               werr = WERR_GENERAL_FAILURE;
                goto done;
        }
 
        tmp_services = talloc_array(tmp_ctx, struct smbconf_service *,
                                    tmp_num_shares);
-
        if (tmp_services == NULL) {
-               werr = WERR_NOMEM;
+               err = SBC_ERR_NOMEM;
                goto done;
        }
 
@@ -181,12 +178,11 @@ WERROR smbconf_get_config(struct smbconf_ctx *ctx,
                                        tmp_share_names[count],
                                        &tmp_services[count]);
                if (!SBC_ERROR_IS_OK(err)) {
-                       werr = WERR_GENERAL_FAILURE;
                        goto done;
                }
        }
 
-       werr = WERR_OK;
+       err = SBC_ERR_OK;
 
        *num_shares = tmp_num_shares;
        if (tmp_num_shares > 0) {
@@ -197,7 +193,7 @@ WERROR smbconf_get_config(struct smbconf_ctx *ctx,
 
 done:
        talloc_free(tmp_ctx);
-       return werr;
+       return err;
 }
 
 /**
@@ -330,7 +326,7 @@ sbcErr smbconf_get_global_parameter(struct smbconf_ctx *ctx,
 /**
  * delete a parameter from configuration
  */
-WERROR smbconf_delete_parameter(struct smbconf_ctx *ctx,
+sbcErr smbconf_delete_parameter(struct smbconf_ctx *ctx,
                                const char *service, const char *param)
 {
        return ctx->ops->delete_parameter(ctx, service, param);
@@ -341,22 +337,21 @@ WERROR smbconf_delete_parameter(struct smbconf_ctx *ctx,
  *
  * Create [global] if it does not exist.
  */
-WERROR smbconf_delete_global_parameter(struct smbconf_ctx *ctx,
+sbcErr smbconf_delete_global_parameter(struct smbconf_ctx *ctx,
                                       const char *param)
 {
-       WERROR werr;
        sbcErr err;
 
        err = smbconf_global_check(ctx);
        if (!SBC_ERROR_IS_OK(err)) {
-               return WERR_GENERAL_FAILURE;
+               return err;
        }
-       werr = smbconf_delete_parameter(ctx, GLOBAL_NAME, param);
+       err = smbconf_delete_parameter(ctx, GLOBAL_NAME, param);
 
-       return werr;
+       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)
@@ -365,78 +360,75 @@ 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,
+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;
 }
 
 
-WERROR smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service)
+sbcErr smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service)
 {
        return ctx->ops->delete_includes(ctx, service);
 }
 
-WERROR smbconf_delete_global_includes(struct smbconf_ctx *ctx)
+sbcErr smbconf_delete_global_includes(struct smbconf_ctx *ctx)
 {
-       WERROR werr;
        sbcErr err;
 
        err = smbconf_global_check(ctx);
        if (!SBC_ERROR_IS_OK(err)) {
-               return WERR_GENERAL_FAILURE;
+               return err;
        }
-       werr = smbconf_delete_includes(ctx, GLOBAL_NAME);
+       err = smbconf_delete_includes(ctx, GLOBAL_NAME);
 
-       return werr;
+       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);
 }