fuzzers: move several fuzzers

31 files changed, 23 insertions, 32 deletions

diff --git a/src/fuzz/fuzz-unit-file.c b/src/core/fuzz-unit-file.c
index e67f6e9199..e67f6e9199 100644
--- a/src/fuzz/fuzz-unit-file.c
+++ b/src/core/fuzz-unit-file.c
diff --git a/src/fuzz/fuzz-unit-file.options b/src/core/fuzz-unit-file.options
index 678d526b1e..678d526b1e 100644
--- a/src/fuzz/fuzz-unit-file.options
+++ b/src/core/fuzz-unit-file.options
diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build
index f4508b5140..36bef1c7af 100644
--- a/src/fuzz/meson.build
+++ b/src/fuzz/meson.build
@@ -7,7 +7,7 @@ fuzzers += [
          [libjournal_core,
           libshared]],
 
-        [['src/fuzz/fuzz-dns-packet.c',
+        [['src/resolve/fuzz-dns-packet.c',
           dns_type_headers],
          [libsystemd_resolve_core,
           libshared],
@@ -15,28 +15,19 @@ fuzzers += [
           libgpg_error,
           libm]],
 
-        [['src/fuzz/fuzz-dhcp6-client.c',
-          'src/libsystemd-network/dhcp-identifier.h',
-          'src/libsystemd-network/dhcp-identifier.c',
-          'src/libsystemd-network/dhcp6-internal.h',
-          'src/systemd/sd-dhcp6-client.h'],
+        [['src/libsystemd-network/fuzz-dhcp6-client.c'],
          [libshared,
           libsystemd_network]],
 
-        [['src/fuzz/fuzz-dhcp-server.c'],
+        [['src/libsystemd-network/fuzz-dhcp-server.c'],
          [libsystemd_network,
           libshared]],
 
-        [['src/fuzz/fuzz-lldp.c'],
+        [['src/libsystemd-network/fuzz-lldp.c'],
          [libshared,
           libsystemd_network]],
 
-        [['src/fuzz/fuzz-ndisc-rs.c',
-          'src/libsystemd-network/dhcp-identifier.h',
-          'src/libsystemd-network/dhcp-identifier.c',
-          'src/libsystemd-network/icmp6-util.h',
-          'src/systemd/sd-dhcp6-client.h',
-          'src/systemd/sd-ndisc.h'],
+        [['src/libsystemd-network/fuzz-ndisc-rs.c'],
          [libshared,
           libsystemd_network]],
 
@@ -44,54 +35,54 @@ fuzzers += [
 
         [['src/fuzz/fuzz-varlink.c']],
 
-        [['src/fuzz/fuzz-unit-file.c'],
+        [['src/core/fuzz-unit-file.c'],
          [libcore,
           libshared],
          [libmount]],
 
-        [['src/fuzz/fuzz-journald-audit.c',
-          'src/fuzz/fuzz-journald.c'],
+        [['src/journal/fuzz-journald-audit.c',
+          'src/journal/fuzz-journald.c'],
          [libjournal_core,
           libshared],
          [libselinux]],
 
-        [['src/fuzz/fuzz-journald-kmsg.c',
-          'src/fuzz/fuzz-journald.c'],
+        [['src/journal/fuzz-journald-kmsg.c',
+          'src/journal/fuzz-journald.c'],
          [libjournal_core,
           libshared],
          [libselinux]],
 
-        [['src/fuzz/fuzz-journald-native.c',
-          'src/fuzz/fuzz-journald.c'],
+        [['src/journal/fuzz-journald-native.c',
+          'src/journal/fuzz-journald.c'],
          [libjournal_core,
           libshared],
          [libselinux]],
 
-        [['src/fuzz/fuzz-journald-native-fd.c',
-          'src/fuzz/fuzz-journald.c'],
+        [['src/journal/fuzz-journald-native-fd.c',
+          'src/journal/fuzz-journald.c'],
          [libjournal_core,
           libshared],
          [libselinux]],
 
-        [['src/fuzz/fuzz-journald-stream.c',
-          'src/fuzz/fuzz-journald.c'],
+        [['src/journal/fuzz-journald-stream.c',
+          'src/journal/fuzz-journald.c'],
          [libjournal_core,
           libshared],
          [libselinux]],
 
-        [['src/fuzz/fuzz-journald-syslog.c',
-          'src/fuzz/fuzz-journald.c'],
+        [['src/journal/fuzz-journald-syslog.c',
+          'src/journal/fuzz-journald.c'],
          [libjournal_core,
           libshared],
          [libselinux]],
 
-        [['src/fuzz/fuzz-journal-remote.c'],
+        [['src/journal-remote/fuzz-journal-remote.c'],
          [libsystemd_journal_remote,
           libshared]],
 
         [['src/fuzz/fuzz-udev-database.c']],
 
-        [['src/fuzz/fuzz-udev-rules.c'],
+        [['src/udev/fuzz-udev-rules.c'],
          [libudevd_core,
           libshared],
          [threads,
@@ -105,12 +96,12 @@ fuzzers += [
 
         [['src/fuzz/fuzz-hostname-setup.c']],
 
-        [['src/fuzz/fuzz-nspawn-settings.c'],
+        [['src/nspawn/fuzz-nspawn-settings.c'],
          [libshared,
           libnspawn_core],
          [libseccomp]],
 
-        [['src/fuzz/fuzz-nspawn-oci.c'],
+        [['src/nspawn/fuzz-nspawn-oci.c'],
          [libshared,
           libnspawn_core],
          [libseccomp]],
@@ -123,5 +114,5 @@ fuzzers += [
           'src/xdg-autostart-generator/xdg-autostart-service.h',
           'src/xdg-autostart-generator/xdg-autostart-service.c']],
 
-        [['src/fuzz/fuzz-udev-rule-parse-value.c']],
+        [['src/udev/fuzz-udev-rule-parse-value.c']],
 ]
diff --git a/src/fuzz/fuzz-journal-remote.c b/src/journal-remote/fuzz-journal-remote.c
index 9adbd43748..9adbd43748 100644
--- a/src/fuzz/fuzz-journal-remote.c
+++ b/src/journal-remote/fuzz-journal-remote.c
diff --git a/src/fuzz/fuzz-journal-remote.options b/src/journal-remote/fuzz-journal-remote.options
index 678d526b1e..678d526b1e 100644
--- a/src/fuzz/fuzz-journal-remote.options
+++ b/src/journal-remote/fuzz-journal-remote.options
diff --git a/src/fuzz/fuzz-journald-audit.c b/src/journal/fuzz-journald-audit.c
index 6e8e18048e..6e8e18048e 100644
--- a/src/fuzz/fuzz-journald-audit.c
+++ b/src/journal/fuzz-journald-audit.c
diff --git a/src/fuzz/fuzz-journald-kmsg.c b/src/journal/fuzz-journald-kmsg.c
index 1b423d5cba..1b423d5cba 100644
--- a/src/fuzz/fuzz-journald-kmsg.c
+++ b/src/journal/fuzz-journald-kmsg.c
diff --git a/src/fuzz/fuzz-journald-native-fd.c b/src/journal/fuzz-journald-native-fd.c
index fcfc5dfaba..fcfc5dfaba 100644
--- a/src/fuzz/fuzz-journald-native-fd.c
+++ b/src/journal/fuzz-journald-native-fd.c
diff --git a/src/fuzz/fuzz-journald-native.c b/src/journal/fuzz-journald-native.c
index 6531c4f668..6531c4f668 100644
--- a/src/fuzz/fuzz-journald-native.c
+++ b/src/journal/fuzz-journald-native.c
diff --git a/src/fuzz/fuzz-journald-stream.c b/src/journal/fuzz-journald-stream.c
index 038b335cb3..038b335cb3 100644
--- a/src/fuzz/fuzz-journald-stream.c
+++ b/src/journal/fuzz-journald-stream.c
diff --git a/src/fuzz/fuzz-journald-stream.options b/src/journal/fuzz-journald-stream.options
index 678d526b1e..678d526b1e 100644
--- a/src/fuzz/fuzz-journald-stream.options
+++ b/src/journal/fuzz-journald-stream.options
diff --git a/src/fuzz/fuzz-journald-syslog.c b/src/journal/fuzz-journald-syslog.c
index 72ec610fbf..72ec610fbf 100644
--- a/src/fuzz/fuzz-journald-syslog.c
+++ b/src/journal/fuzz-journald-syslog.c
diff --git a/src/fuzz/fuzz-journald.c b/src/journal/fuzz-journald.c
index e2f73ffa7e..e2f73ffa7e 100644
--- a/src/fuzz/fuzz-journald.c
+++ b/src/journal/fuzz-journald.c
diff --git a/src/fuzz/fuzz-journald.h b/src/journal/fuzz-journald.h
index 4abb1005ca..4abb1005ca 100644
--- a/src/fuzz/fuzz-journald.h
+++ b/src/journal/fuzz-journald.h
diff --git a/src/fuzz/fuzz-dhcp-server.c b/src/libsystemd-network/fuzz-dhcp-server.c
index c854d921c0..c854d921c0 100644
--- a/src/fuzz/fuzz-dhcp-server.c
+++ b/src/libsystemd-network/fuzz-dhcp-server.c
diff --git a/src/fuzz/fuzz-dhcp-server.options b/src/libsystemd-network/fuzz-dhcp-server.options
index 5c330e5cec..5c330e5cec 100644
--- a/src/fuzz/fuzz-dhcp-server.options
+++ b/src/libsystemd-network/fuzz-dhcp-server.options
diff --git a/src/fuzz/fuzz-dhcp6-client.c b/src/libsystemd-network/fuzz-dhcp6-client.c
index e5e70dd606..e5e70dd606 100644
--- a/src/fuzz/fuzz-dhcp6-client.c
+++ b/src/libsystemd-network/fuzz-dhcp6-client.c
diff --git a/src/fuzz/fuzz-dhcp6-client.options b/src/libsystemd-network/fuzz-dhcp6-client.options
index 678d526b1e..678d526b1e 100644
--- a/src/fuzz/fuzz-dhcp6-client.options
+++ b/src/libsystemd-network/fuzz-dhcp6-client.options
diff --git a/src/fuzz/fuzz-lldp.c b/src/libsystemd-network/fuzz-lldp.c
index 5747135b32..5747135b32 100644
--- a/src/fuzz/fuzz-lldp.c
+++ b/src/libsystemd-network/fuzz-lldp.c
diff --git a/src/fuzz/fuzz-lldp.options b/src/libsystemd-network/fuzz-lldp.options
index 60bd9b0b2f..60bd9b0b2f 100644
--- a/src/fuzz/fuzz-lldp.options
+++ b/src/libsystemd-network/fuzz-lldp.options
diff --git a/src/fuzz/fuzz-ndisc-rs.c b/src/libsystemd-network/fuzz-ndisc-rs.c
index d74cd2fffc..d74cd2fffc 100644
--- a/src/fuzz/fuzz-ndisc-rs.c
+++ b/src/libsystemd-network/fuzz-ndisc-rs.c
diff --git a/src/fuzz/fuzz-ndisc-rs.options b/src/libsystemd-network/fuzz-ndisc-rs.options
index 60bd9b0b2f..60bd9b0b2f 100644
--- a/src/fuzz/fuzz-ndisc-rs.options
+++ b/src/libsystemd-network/fuzz-ndisc-rs.options
diff --git a/src/fuzz/fuzz-nspawn-oci.c b/src/nspawn/fuzz-nspawn-oci.c
index cfebf65c00..cfebf65c00 100644
--- a/src/fuzz/fuzz-nspawn-oci.c
+++ b/src/nspawn/fuzz-nspawn-oci.c
diff --git a/src/fuzz/fuzz-nspawn-oci.options b/src/nspawn/fuzz-nspawn-oci.options
index 678d526b1e..678d526b1e 100644
--- a/src/fuzz/fuzz-nspawn-oci.options
+++ b/src/nspawn/fuzz-nspawn-oci.options
diff --git a/src/fuzz/fuzz-nspawn-settings.c b/src/nspawn/fuzz-nspawn-settings.c
index bd98ed26e8..bd98ed26e8 100644
--- a/src/fuzz/fuzz-nspawn-settings.c
+++ b/src/nspawn/fuzz-nspawn-settings.c
diff --git a/src/fuzz/fuzz-nspawn-settings.options b/src/nspawn/fuzz-nspawn-settings.options
index 678d526b1e..678d526b1e 100644
--- a/src/fuzz/fuzz-nspawn-settings.options
+++ b/src/nspawn/fuzz-nspawn-settings.options
diff --git a/src/fuzz/fuzz-dns-packet.c b/src/resolve/fuzz-dns-packet.c
index b9a0aa1216..b9a0aa1216 100644
--- a/src/fuzz/fuzz-dns-packet.c
+++ b/src/resolve/fuzz-dns-packet.c
diff --git a/src/fuzz/fuzz-dns-packet.options b/src/resolve/fuzz-dns-packet.options
index 0824b19fab..0824b19fab 100644
--- a/src/fuzz/fuzz-dns-packet.options
+++ b/src/resolve/fuzz-dns-packet.options
diff --git a/src/fuzz/fuzz-udev-rule-parse-value.c b/src/udev/fuzz-udev-rule-parse-value.c
index 404d0cd142..404d0cd142 100644
--- a/src/fuzz/fuzz-udev-rule-parse-value.c
+++ b/src/udev/fuzz-udev-rule-parse-value.c
diff --git a/src/fuzz/fuzz-udev-rules.c b/src/udev/fuzz-udev-rules.c
index e1140bc68e..e1140bc68e 100644
--- a/src/fuzz/fuzz-udev-rules.c
+++ b/src/udev/fuzz-udev-rules.c
diff --git a/src/fuzz/fuzz-udev-rules.options b/src/udev/fuzz-udev-rules.options
index 678d526b1e..678d526b1e 100644
--- a/src/fuzz/fuzz-udev-rules.options
+++ b/src/udev/fuzz-udev-rules.options