From: Volker Lendecke <vl@samba.org>
Date: Sun, 14 Jun 2026 07:04:10 +0000 (+0200)
Subject: addns: Move DNS hand-marshalling smbtorture4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bffb51f09ab30eb4dc613c60b90d77ab0e7c1765;p=thirdparty%2Fsamba.git

addns: Move DNS hand-marshalling smbtorture4

Move it out of production code.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Fri Jul  3 09:13:05 UTC 2026 on atb-devel-224
---

diff --git a/lib/addns/wscript_build b/lib/addns/wscript_build
index 662187f37ac..7fc4d16c310 100644
--- a/lib/addns/wscript_build
+++ b/lib/addns/wscript_build
@@ -3,11 +3,8 @@
 bld.SAMBA_LIBRARY('addns',
                    source='''
                        dnsquery.c
-                       dnsrecord.c
-                       dnssock.c
-                       dnsmarshall.c
                        dnsquery_srv.c
                    ''',
-                   public_deps='samba-util gensec ndr resolv dns_lookup',
+                   public_deps='dns_lookup',
                    private_library=True,
                    vars=locals())
diff --git a/lib/addns/dns.h b/source4/torture/dns/dns.h
similarity index 100%
rename from lib/addns/dns.h
rename to source4/torture/dns/dns.h
diff --git a/lib/addns/dnserr.h b/source4/torture/dns/dnserr.h
similarity index 100%
rename from lib/addns/dnserr.h
rename to source4/torture/dns/dnserr.h
diff --git a/lib/addns/dnsmarshall.c b/source4/torture/dns/dnsmarshall.c
similarity index 100%
rename from lib/addns/dnsmarshall.c
rename to source4/torture/dns/dnsmarshall.c
diff --git a/lib/addns/dnsrecord.c b/source4/torture/dns/dnsrecord.c
similarity index 100%
rename from lib/addns/dnsrecord.c
rename to source4/torture/dns/dnsrecord.c
diff --git a/lib/addns/dnssock.c b/source4/torture/dns/dnssock.c
similarity index 100%
rename from lib/addns/dnssock.c
rename to source4/torture/dns/dnssock.c
diff --git a/source4/torture/dns/internal_dns.c b/source4/torture/dns/internal_dns.c
index fa42e60fa4b..794510019f9 100644
--- a/source4/torture/dns/internal_dns.c
+++ b/source4/torture/dns/internal_dns.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "torture/smbtorture.h"
 #include <talloc.h>
-#include "lib/addns/dns.h"
+#include "dns.h"
 
 static struct dns_connection *setup_connection(struct torture_context *tctx)
 {
diff --git a/source4/torture/dns/wscript_build b/source4/torture/dns/wscript_build
index 0b40e03e370..467eb1330f8 100644
--- a/source4/torture/dns/wscript_build
+++ b/source4/torture/dns/wscript_build
@@ -11,7 +11,7 @@ if bld.AD_DC_BUILD_IS_ENABLED():
 		)
 
 	bld.SAMBA_MODULE('TORTURE_INTERNAL_DNS',
-		source='internal_dns.c',
+		source='internal_dns.c dnsmarshall.c dnsrecord.c dnssock.c',
 		subsystem='smbtorture',
 		init_function='torture_internal_dns_init',
 		deps='torture talloc torturemain',