summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-03-10 16:08:38 +0100
committerKarolin Seeger <kseeger@samba.org>2009-03-27 13:06:52 +0100
commite6b8b7e442f32a73ca87436617f0d63014cc5ade (patch)
tree25a20f31f4e1251d82741b6b7e9af104b37af981
parent3a5a4c237182057d571b19dbae7ee553db0a195c (diff)
downloadsamba-e6b8b7e442f32a73ca87436617f0d63014cc5ade.tar.gz
samba-e6b8b7e442f32a73ca87436617f0d63014cc5ade.tar.xz
samba-e6b8b7e442f32a73ca87436617f0d63014cc5ade.zip
Revert "Revert "Fix a valgrind error / segfault in dns_register_smbd()""
This reverts commit 96c57d26ed790b3e94c935cc4faf5661ea43a80c. (cherry picked from commit 045933cf5bf27fbb704e446cf8686f2f761a1ced)
-rw-r--r--source/smbd/dnsregister.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/smbd/dnsregister.c b/source/smbd/dnsregister.c
index 2319097ca56..f304d862d42 100644
--- a/source/smbd/dnsregister.c
+++ b/source/smbd/dnsregister.c
@@ -109,7 +109,8 @@ void dns_register_smbd(struct dns_reg_state ** dns_state_ptr,
struct dns_reg_state *dns_state = *dns_state_ptr;
if (dns_state == NULL) {
- *dns_state_ptr = dns_state = talloc(NULL, struct dns_reg_state);
+ dns_state = talloc_zero(NULL, struct dns_reg_state);
+ *dns_state_ptr = dns_state;
if (dns_state == NULL) {
return;
}