summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-03-10 15:46:16 +0100
committerKarolin Seeger <kseeger@samba.org>2009-03-27 13:06:52 +0100
commit3a5a4c237182057d571b19dbae7ee553db0a195c (patch)
tree3c823244b42d1541bfef907dc6c30cbbabcb9eab
parentf4b5d9720472b4c27d98b4ddb244ace6850861a7 (diff)
downloadsamba-3a5a4c237182057d571b19dbae7ee553db0a195c.tar.gz
samba-3a5a4c237182057d571b19dbae7ee553db0a195c.tar.xz
samba-3a5a4c237182057d571b19dbae7ee553db0a195c.zip
Revert "Fix a valgrind error / segfault in dns_register_smbd()"
This reverts commit e47d2091136c4d870bb91b8a84eb9f6fd78eb971. No idea why, but this causes timeouts in the build farm all over the place (cherry picked from commit 0cf74151286238890ae0da0863e3a5807f4f3d81)
-rw-r--r--source/smbd/dnsregister.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/smbd/dnsregister.c b/source/smbd/dnsregister.c
index f304d862d42..2319097ca56 100644
--- a/source/smbd/dnsregister.c
+++ b/source/smbd/dnsregister.c
@@ -109,8 +109,7 @@ 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 = talloc_zero(NULL, struct dns_reg_state);
- *dns_state_ptr = dns_state;
+ *dns_state_ptr = dns_state = talloc(NULL, struct dns_reg_state);
if (dns_state == NULL) {
return;
}