summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-12-29 17:06:49 +0100
committerMichael Adam <obnox@samba.org>2007-12-29 17:06:49 +0100
commit397b4d5397e87fa60e35ac1f36facf2411ebc126 (patch)
tree2b8aaacf4305bd2e9f24f7ecb5c0fb7e3dc2b620
parenta6d6fbb73d56d3b96ccf55c1d028c5af00d83386 (diff)
downloadsamba-397b4d5397e87fa60e35ac1f36facf2411ebc126.tar.gz
samba-397b4d5397e87fa60e35ac1f36facf2411ebc126.tar.bz2
samba-397b4d5397e87fa60e35ac1f36facf2411ebc126.zip
Return NULL (instead of unchanged) for no shares/parameters defined.
Michael (This used to be commit bfe3d1462f52d2849611fc58ad70fa08b4917077)
-rw-r--r--source3/libnet/libnet_conf.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/libnet/libnet_conf.c b/source3/libnet/libnet_conf.c
index 300ea916cd..3f5265a452 100644
--- a/source3/libnet/libnet_conf.c
+++ b/source3/libnet/libnet_conf.c
@@ -358,6 +358,9 @@ static WERROR libnet_smbconf_reg_get_values(TALLOC_CTX *mem_ctx,
if (count > 0) {
*value_names = talloc_move(mem_ctx, &tmp_valnames);
*value_strings = talloc_move(mem_ctx, &tmp_valstrings);
+ } else {
+ *value_names = NULL;
+ *value_strings = NULL;
}
done:
@@ -486,6 +489,8 @@ WERROR libnet_smbconf_get_share_names(TALLOC_CTX *mem_ctx, uint32_t *num_shares,
*num_shares = added_count;
if (added_count > 0) {
*share_names = talloc_move(mem_ctx, &tmp_share_names);
+ } else {
+ *share_names = NULL;
}
done: