summaryrefslogtreecommitdiff
path: root/src/grp-resolve
diff options
context:
space:
mode:
Diffstat (limited to 'src/grp-resolve')
l---------src/grp-resolve/systemd-resolved/gcrypt-util.c2
l---------src/grp-resolve/systemd-resolved/gcrypt-util.h2
-rw-r--r--src/grp-resolve/systemd-resolved/resolve-tool.c4
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-bus.c4
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-conf.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-answer.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-cache.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c4
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-packet.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-query.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-question.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-rr.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-scope.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-transaction.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-dns-zone.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-gperf.gperf2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-link-bus.c4
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-link.h2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-manager.c2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-manager.h2
-rw-r--r--src/grp-resolve/systemd-resolved/resolved-resolv-conf.c2
-rw-r--r--src/grp-resolve/systemd-resolved/test-resolve-tables.c2
25 files changed, 29 insertions, 29 deletions
diff --git a/src/grp-resolve/systemd-resolved/gcrypt-util.c b/src/grp-resolve/systemd-resolved/gcrypt-util.c
index 79dc82a466..5b2fae92e2 120000
--- a/src/grp-resolve/systemd-resolved/gcrypt-util.c
+++ b/src/grp-resolve/systemd-resolved/gcrypt-util.c
@@ -1 +1 @@
-../../libshared/gcrypt-util.c \ No newline at end of file
+../../libshared/src/gcrypt-util.c \ No newline at end of file
diff --git a/src/grp-resolve/systemd-resolved/gcrypt-util.h b/src/grp-resolve/systemd-resolved/gcrypt-util.h
index 6da58160eb..e1ad70b84f 120000
--- a/src/grp-resolve/systemd-resolved/gcrypt-util.h
+++ b/src/grp-resolve/systemd-resolved/gcrypt-util.h
@@ -1 +1 @@
-../../libshared/gcrypt-util.h \ No newline at end of file
+../../libshared/include/shared/gcrypt-util.h \ No newline at end of file
diff --git a/src/grp-resolve/systemd-resolved/resolve-tool.c b/src/grp-resolve/systemd-resolved/resolve-tool.c
index 7824a36d3d..f140820e0f 100644
--- a/src/grp-resolve/systemd-resolved/resolve-tool.c
+++ b/src/grp-resolve/systemd-resolved/resolve-tool.c
@@ -25,10 +25,10 @@
#include "basic/af-list.h"
#include "basic/alloc-util.h"
#include "sd-bus/bus-error.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
#include "basic/escape.h"
#include "basic/in-addr-util.h"
-#include "gcrypt-util.h"
+#include "shared/gcrypt-util.h"
#include "basic/parse-util.h"
#include "resolved-def.h"
#include "resolved-dns-packet.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-bus.c b/src/grp-resolve/systemd-resolved/resolved-bus.c
index 49a7addc24..ff0bcdfef4 100644
--- a/src/grp-resolve/systemd-resolved/resolved-bus.c
+++ b/src/grp-resolve/systemd-resolved/resolved-bus.c
@@ -19,8 +19,8 @@
#include "basic/alloc-util.h"
#include "sd-bus/bus-common-errors.h"
-#include "bus-util.h"
-#include "dns-domain.h"
+#include "shared/bus-util.h"
+#include "shared/dns-domain.h"
#include "resolved-bus.h"
#include "resolved-def.h"
#include "resolved-dns-synthesize.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-conf.c b/src/grp-resolve/systemd-resolved/resolved-conf.c
index 3b33d45a6a..e22f107419 100644
--- a/src/grp-resolve/systemd-resolved/resolved-conf.c
+++ b/src/grp-resolve/systemd-resolved/resolved-conf.c
@@ -18,7 +18,7 @@
***/
#include "basic/alloc-util.h"
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
#include "basic/def.h"
#include "basic/extract-word.h"
#include "basic/parse-util.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-answer.c b/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
index bd3aef6e5e..f9f7e91c1a 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
@@ -18,7 +18,7 @@
***/
#include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "resolved-dns-answer.h"
#include "resolved-dns-dnssec.h"
#include "basic/string-util.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
index 8b67a7b903..0527c57e1c 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-cache.c
@@ -21,7 +21,7 @@
#include "basic/af-list.h"
#include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "resolved-dns-answer.h"
#include "resolved-dns-cache.h"
#include "resolved-dns-packet.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c
index 94524703b7..39afbada25 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c
@@ -22,8 +22,8 @@
#endif
#include "basic/alloc-util.h"
-#include "dns-domain.h"
-#include "gcrypt-util.h"
+#include "shared/dns-domain.h"
+#include "shared/gcrypt-util.h"
#include "basic/hexdecoct.h"
#include "resolved-dns-dnssec.h"
#include "resolved-dns-packet.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h
index 77bd4d71bf..c2ebff767f 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h
@@ -22,7 +22,7 @@
typedef enum DnssecResult DnssecResult;
typedef enum DnssecVerdict DnssecVerdict;
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "resolved-dns-answer.h"
#include "resolved-dns-rr.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-packet.c b/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
index 07fc9f5b73..b379b2bb97 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
@@ -18,7 +18,7 @@
***/
#include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "resolved-dns-packet.h"
#include "basic/string-table.h"
#include "basic/strv.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-query.c b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
index a1e471be92..0a62571af7 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-query.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.c
@@ -18,7 +18,7 @@
***/
#include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "dns-type.h"
#include "basic/hostname-util.h"
#include "sd-netlink/local-addresses.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-question.c b/src/grp-resolve/systemd-resolved/resolved-dns-question.c
index 9e15ad45dd..cdbbecc488 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-question.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-question.c
@@ -18,7 +18,7 @@
***/
#include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "dns-type.h"
#include "resolved-dns-question.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-rr.c b/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
index c1a729ce94..e53b2c1831 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
@@ -20,7 +20,7 @@
#include <math.h>
#include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "dns-type.h"
#include "basic/escape.h"
#include "basic/hexdecoct.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-scope.c b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
index a77162663d..98897ff41c 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-scope.c
@@ -21,7 +21,7 @@
#include "basic/af-list.h"
#include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "basic/fd-util.h"
#include "basic/hostname-util.h"
#include "basic/missing.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
index 71824d8c4a..d3b8bf3b4d 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-search-domain.c
@@ -18,7 +18,7 @@
***/
#include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "resolved-dns-search-domain.h"
int dns_search_domain_new(
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
index f5c52a5185..abaa11d803 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-transaction.c
@@ -21,7 +21,7 @@
#include "basic/af-list.h"
#include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "basic/errno-list.h"
#include "basic/fd-util.h"
#include "basic/random-util.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
index f1998f99f7..f810c82848 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-trust-anchor.c
@@ -22,7 +22,7 @@
#include "basic/alloc-util.h"
#include "basic/conf-files.h"
#include "basic/def.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "basic/fd-util.h"
#include "basic/fileio.h"
#include "basic/hexdecoct.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
index f78e6da33c..97048c45d1 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
+++ b/src/grp-resolve/systemd-resolved/resolved-dns-zone.c
@@ -18,7 +18,7 @@
***/
#include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "basic/list.h"
#include "resolved-dns-packet.h"
#include "resolved-dns-zone.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-gperf.gperf b/src/grp-resolve/systemd-resolved/resolved-gperf.gperf
index 82f26215df..5d1c209c35 100644
--- a/src/grp-resolve/systemd-resolved/resolved-gperf.gperf
+++ b/src/grp-resolve/systemd-resolved/resolved-gperf.gperf
@@ -1,6 +1,6 @@
%{
#include <stddef.h>
-#include "conf-parser.h"
+#include "shared/conf-parser.h"
#include "resolved-conf.h"
%}
struct ConfigPerfItem;
diff --git a/src/grp-resolve/systemd-resolved/resolved-link-bus.c b/src/grp-resolve/systemd-resolved/resolved-link-bus.c
index 2a51c3a1b0..3c0c032fac 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link-bus.c
+++ b/src/grp-resolve/systemd-resolved/resolved-link-bus.c
@@ -18,9 +18,9 @@
***/
#include "basic/alloc-util.h"
-#include "bus-util.h"
+#include "shared/bus-util.h"
#include "basic/parse-util.h"
-#include "resolve-util.h"
+#include "shared/resolve-util.h"
#include "resolved-bus.h"
#include "resolved-link-bus.h"
#include "basic/strv.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-link.h b/src/grp-resolve/systemd-resolved/resolved-link.h
index 051716db96..cc4f4f59d7 100644
--- a/src/grp-resolve/systemd-resolved/resolved-link.h
+++ b/src/grp-resolve/systemd-resolved/resolved-link.h
@@ -23,7 +23,7 @@
#include "basic/in-addr-util.h"
#include "basic/ratelimit.h"
-#include "resolve-util.h"
+#include "shared/resolve-util.h"
typedef struct Link Link;
typedef struct LinkAddress LinkAddress;
diff --git a/src/grp-resolve/systemd-resolved/resolved-manager.c b/src/grp-resolve/systemd-resolved/resolved-manager.c
index 0294345294..b2b3daaf5c 100644
--- a/src/grp-resolve/systemd-resolved/resolved-manager.c
+++ b/src/grp-resolve/systemd-resolved/resolved-manager.c
@@ -23,7 +23,7 @@
#include "basic/af-list.h"
#include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "basic/fd-util.h"
#include "basic/fileio-label.h"
#include "basic/hostname-util.h"
diff --git a/src/grp-resolve/systemd-resolved/resolved-manager.h b/src/grp-resolve/systemd-resolved/resolved-manager.h
index 49fac4c346..1860994463 100644
--- a/src/grp-resolve/systemd-resolved/resolved-manager.h
+++ b/src/grp-resolve/systemd-resolved/resolved-manager.h
@@ -26,7 +26,7 @@
#include "basic/hashmap.h"
#include "basic/list.h"
#include "basic/ordered-set.h"
-#include "resolve-util.h"
+#include "shared/resolve-util.h"
typedef struct Manager Manager;
diff --git a/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
index 5e1f293de0..70f9173c22 100644
--- a/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
+++ b/src/grp-resolve/systemd-resolved/resolved-resolv-conf.c
@@ -20,7 +20,7 @@
#include <resolv.h>
#include "basic/alloc-util.h"
-#include "dns-domain.h"
+#include "shared/dns-domain.h"
#include "basic/fd-util.h"
#include "basic/fileio-label.h"
#include "basic/fileio.h"
diff --git a/src/grp-resolve/systemd-resolved/test-resolve-tables.c b/src/grp-resolve/systemd-resolved/test-resolve-tables.c
index 2d615130e1..0307c6485f 100644
--- a/src/grp-resolve/systemd-resolved/test-resolve-tables.c
+++ b/src/grp-resolve/systemd-resolved/test-resolve-tables.c
@@ -18,7 +18,7 @@
***/
#include "dns-type.h"
-#include "test-tables.h"
+#include "shared/test-tables.h"
int main(int argc, char **argv) {
uint16_t i;