diff options
| author | Andreas Schneider <asn@samba.org> | 2011-04-11 11:39:03 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-05-10 19:13:21 +0200 |
| commit | fbd7626656d8d76f371e431005fbfa1228ba2029 (patch) | |
| tree | 94d26a23735d6177f72ffae41bc1ce0418356c69 /source3/utils | |
| parent | 7f355e05f9ca41f9ba2bc7c9f14046a283ebd1d1 (diff) | |
| download | samba-fbd7626656d8d76f371e431005fbfa1228ba2029.tar.gz samba-fbd7626656d8d76f371e431005fbfa1228ba2029.tar.bz2 samba-fbd7626656d8d76f371e431005fbfa1228ba2029.zip | |
libsmbconf: Convert smbconf_delete_share() to sbcErr.
Signed-off-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_conf.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index d4f91c691a..7e166e8e37 100644 --- a/source3/utils/net_conf.c +++ b/source3/utils/net_conf.c @@ -201,8 +201,9 @@ static WERROR import_process_service(struct net_context *c, } if (smbconf_share_exists(conf_ctx, service->name)) { - werr = smbconf_delete_share(conf_ctx, service->name); - if (!W_ERROR_IS_OK(werr)) { + err = smbconf_delete_share(conf_ctx, service->name); + if (!SBC_ERROR_IS_OK(err)) { + werr = WERR_GENERAL_FAILURE; goto done; } } @@ -792,7 +793,7 @@ static int net_conf_delshare(struct net_context *c, { int ret = -1; const char *sharename = NULL; - WERROR werr = WERR_OK; + sbcErr err; TALLOC_CTX *mem_ctx = talloc_stackframe(); if (argc != 1 || c->display_usage) { @@ -805,10 +806,10 @@ static int net_conf_delshare(struct net_context *c, goto done; } - werr = smbconf_delete_share(conf_ctx, sharename); - if (!W_ERROR_IS_OK(werr)) { + err = smbconf_delete_share(conf_ctx, sharename); + if (!SBC_ERROR_IS_OK(err)) { d_fprintf(stderr, _("Error deleting share %s: %s\n"), - sharename, win_errstr(werr)); + sharename, sbcErrorString(err)); goto done; } |