diff options
| author | Michael Adam <obnox@samba.org> | 2007-12-25 02:31:41 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2007-12-25 02:37:02 +0100 |
| commit | 86486fcc9826663f7bf03fe4ceb354818415d089 (patch) | |
| tree | c79e8f10f1a5f6c631e469d16c51c71e1cd86224 | |
| parent | 9c20b9a731d581ae8bbf4f9ef66c3b7ded7e4122 (diff) | |
| download | samba-86486fcc9826663f7bf03fe4ceb354818415d089.tar.gz samba-86486fcc9826663f7bf03fe4ceb354818415d089.tar.bz2 samba-86486fcc9826663f7bf03fe4ceb354818415d089.zip | |
Simplify libnet_smbconf_delshare().
Remove talloc context parameter.
Remove d_printf error message.
Michael
(This used to be commit 870d35c04889603843bae989fb9c01396b4c6ed1)
| -rw-r--r-- | source3/libnet/libnet_conf.c | 11 | ||||
| -rw-r--r-- | source3/utils/net_conf.c | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/source3/libnet/libnet_conf.c b/source3/libnet/libnet_conf.c index ad02930ce4..4c5a0829d6 100644 --- a/source3/libnet/libnet_conf.c +++ b/source3/libnet/libnet_conf.c @@ -246,24 +246,21 @@ done: /** * delete a service from configuration */ -WERROR libnet_smbconf_delshare(TALLOC_CTX *ctx, const char *keyname) +WERROR libnet_smbconf_delshare(const char *servicename) { WERROR werr = WERR_OK; struct registry_key *key = NULL; + TALLOC_CTX *ctx = talloc_stackframe(); werr = libnet_smbconf_open_basepath(ctx, REG_KEY_WRITE, &key); if (!W_ERROR_IS_OK(werr)) { goto done; } - werr = reg_deletekey_recursive(key, key, keyname); - if (!W_ERROR_IS_OK(werr)) { - d_fprintf(stderr, "Error deleting registry key %s\\%s: %s\n", - KEY_SMBCONF, keyname, dos_errstr(werr)); - } + werr = reg_deletekey_recursive(key, key, servicename); done: - TALLOC_FREE(key); + TALLOC_FREE(ctx); return werr; } diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index e1b4fe1dfa..38c14d779f 100644 --- a/source3/utils/net_conf.c +++ b/source3/utils/net_conf.c @@ -317,7 +317,7 @@ static int import_process_service(TALLOC_CTX *ctx, d_printf("[%s]\n", servicename); } else { if (libnet_smbconf_key_exists(servicename)) { - werr = libnet_smbconf_delshare(tmp_ctx, servicename); + werr = libnet_smbconf_delshare(servicename); if (!W_ERROR_IS_OK(werr)) { goto done; } @@ -799,7 +799,7 @@ int net_conf_delshare(int argc, const char **argv) } sharename = argv[0]; - if (W_ERROR_IS_OK(libnet_smbconf_delshare(NULL, sharename))) { + if (W_ERROR_IS_OK(libnet_smbconf_delshare(sharename))) { ret = 0; } done: |