diff options
| author | Michael Adam <obnox@samba.org> | 2007-12-23 02:55:25 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2007-12-23 04:10:31 +0100 |
| commit | b04708866f146ada8a7cc353347244df54821fbf (patch) | |
| tree | 993ad031df8f302c7c6d9f77cf45ca68a6bd8ad2 /source3/utils/net_conf.c | |
| parent | ec3e8587ecdef8e4a52d4c37ac379d9e414b861b (diff) | |
| download | samba-b04708866f146ada8a7cc353347244df54821fbf.tar.gz samba-b04708866f146ada8a7cc353347244df54821fbf.tar.bz2 samba-b04708866f146ada8a7cc353347244df54821fbf.zip | |
Move logic of net_smbconf_delparm() to libnet/libnet_conf.c
Logic in new function libnet_smbconf_delparm().
Michael
(This used to be commit 0cff79e3552e91ba0b6bc054802d28afcf4e8da4)
Diffstat (limited to 'source3/utils/net_conf.c')
| -rw-r--r-- | source3/utils/net_conf.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index c4707e4248..8d0b4b9bbe 100644 --- a/source3/utils/net_conf.c +++ b/source3/utils/net_conf.c @@ -995,7 +995,6 @@ static int net_conf_delparm(int argc, const char **argv) { int ret = -1; WERROR werr = WERR_OK; - struct registry_key *key = NULL; char *service = NULL; char *param = NULL; TALLOC_CTX *ctx; @@ -1009,26 +1008,19 @@ static int net_conf_delparm(int argc, const char **argv) service = strdup_lower(argv[0]); param = strdup_lower(argv[1]); - if (!libnet_smbconf_key_exists(ctx, service)) { + werr = libnet_smbconf_delparm(ctx, service, param); + + if (W_ERROR_EQUAL(werr, WERR_NO_SUCH_SERVICE)) { d_fprintf(stderr, "Error: given service '%s' does not exist.\n", service); goto done; - } - - werr = libnet_smbconf_open_path(ctx, service, REG_KEY_READ, &key); - if (!W_ERROR_IS_OK(werr)) { - goto done; - } - - if (!libnet_smbconf_value_exists(ctx, key, param)) { + } else if (W_ERROR_EQUAL(werr, WERR_INVALID_PARAM)) { d_fprintf(stderr, "Error: given parameter '%s' is not set.\n", param); goto done; - } - werr = reg_deletevalue(key, param); - if (!W_ERROR_IS_OK(werr)) { + } else if (!W_ERROR_IS_OK(werr)) { d_fprintf(stderr, "Error deleting value '%s': %s.\n", param, dos_errstr(werr)); goto done; |