diff options
author | Michael Adam <obnox@samba.org> | 2007-12-23 02:44:29 +0100 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2007-12-23 04:10:31 +0100 |
commit | ec3e8587ecdef8e4a52d4c37ac379d9e414b861b (patch) | |
tree | db2fe36e06e81d1a7ee210e2464481007ef381b0 | |
parent | aeea4bfadd98f23df71c5754bef7defc42d2f67f (diff) | |
download | samba-ec3e8587ecdef8e4a52d4c37ac379d9e414b861b.tar.gz samba-ec3e8587ecdef8e4a52d4c37ac379d9e414b861b.tar.bz2 samba-ec3e8587ecdef8e4a52d4c37ac379d9e414b861b.zip |
Move smbconf_value_exists() to libnet/net_conf.c
renaming it to libnet_smbconf_value_exists().
Michael
(This used to be commit ba71c6844588f0342589163f514385911e7331e7)
-rw-r--r-- | source3/libnet/libnet_conf.c | 17 | ||||
-rw-r--r-- | source3/utils/net_conf.c | 18 |
2 files changed, 18 insertions, 17 deletions
diff --git a/source3/libnet/libnet_conf.c b/source3/libnet/libnet_conf.c index dcaa7689b3..9f64e7fc0d 100644 --- a/source3/libnet/libnet_conf.c +++ b/source3/libnet/libnet_conf.c @@ -194,3 +194,20 @@ WERROR libnet_smbconf_set_global_param(TALLOC_CTX *mem_ctx, return do_modify_val_config(key, param, val); } +bool libnet_smbconf_value_exists(TALLOC_CTX *ctx, + struct registry_key *key, + const char *param) +{ + bool ret = False; + WERROR werr = WERR_OK; + struct registry_value *value = NULL; + + werr = reg_queryvalue(ctx, key, param, &value); + if (W_ERROR_IS_OK(werr)) { + ret = True; + } + + TALLOC_FREE(value); + return ret; +} + diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index 808ba8d885..c4707e4248 100644 --- a/source3/utils/net_conf.c +++ b/source3/utils/net_conf.c @@ -238,22 +238,6 @@ done: return werr; } -static bool smbconf_value_exists(TALLOC_CTX *ctx, struct registry_key *key, - const char *param) -{ - bool ret = False; - WERROR werr = WERR_OK; - struct registry_value *value = NULL; - - werr = reg_queryvalue(ctx, key, param, &value); - if (W_ERROR_IS_OK(werr)) { - ret = True; - } - - TALLOC_FREE(value); - return ret; -} - static WERROR list_values(TALLOC_CTX *ctx, struct registry_key *key) { WERROR werr = WERR_OK; @@ -1037,7 +1021,7 @@ static int net_conf_delparm(int argc, const char **argv) goto done; } - if (!smbconf_value_exists(ctx, key, param)) { + if (!libnet_smbconf_value_exists(ctx, key, param)) { d_fprintf(stderr, "Error: given parameter '%s' is not set.\n", param); |