sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Simplify libnet_smbconf_delshare().

Browse Source 
Remove talloc context parameter.
Remove d_printf error message.

Michael
(This used to be commit 870d35c048)
This commit is contained in:
Michael Adam 2007-12-25 02:31:41 +01:00
parent 9c20b9a731
commit 86486fcc98
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/libnet/libnet_conf.c
View File

@ -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;
}

4
source3/utils/net_conf.c
View File

@ -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: