Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Merge requests
!60769
[3.18] main/dnsmasq: security upgrade to 2.90
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
[3.18] main/dnsmasq: security upgrade to 2.90
omni/aports:secup-dnsmasq-318
into
3.18-stable
Overview
0
Commits
1
Pipelines
1
Changes
3
Merged
omni
requested to merge
omni/aports:secup-dnsmasq-318
into
3.18-stable
1 year ago
Overview
0
Commits
1
Pipelines
1
Changes
3
Expand
https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2024q1/017430.html
0
0
Merge request reports
Viewing commit
6dafbb02
Show latest version
3 files
+
6
−
110
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
3
Search (e.g. *.vue) (Ctrl+P)
6dafbb02
main/dnsmasq: security upgrade to 2.90
· 6dafbb02
omni
authored
1 year ago
main/dnsmasq/0001-dbus-allow-setting-filter-A-and-filter-AAAA-options.patch deleted
100644 → 0
+
0
−
64
Options
From e90ed08643fde558f6974e56b085c7a2b45bd563 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 23 Jan 2023 12:40:04 -0800
Subject: [PATCH] dbus: allow setting filter-A and filter-AAAA options
---
dbus/DBus-interface | 8 ++++++++
src/dbus.c | 14 ++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/dbus/DBus-interface b/dbus/DBus-interface
index 59b41b1..00b4465 100644
--- a/dbus/DBus-interface
+++ b/dbus/DBus-interface
@@ -44,6 +44,14 @@
SetFilterWin2KOption
--------------------
Takes boolean, sets or resets the --filterwin2k option.
+SetFilterA
+------------------------
+Takes boolean, sets or resets the --filter-A option.
+
+SetFilterAAAA
+------------------------
+Takes boolean, sets or resets the --filter-AAAA option.
+
SetBogusPrivOption
------------------
Takes boolean, sets or resets the --bogus-priv option.
diff --git a/src/dbus.c b/src/dbus.c
index fd5d1ca..be2c506 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -52,6 +52,12 @@
const char* introspection_xml_template =
" <method name=\"SetFilterWin2KOption\">\n"
" <arg name=\"filterwin2k\" direction=\"in\" type=\"b\"/>\n"
" </method>\n"
+" <method name=\"SetFilterA\">\n"
+" <arg name=\"filter-a\" direction=\"in\" type=\"b\"/>\n"
+" </method>\n"
+" <method name=\"SetFilterAAAA\">\n"
+" <arg name=\"filter-aaaa\" direction=\"in\" type=\"b\"/>\n"
+" </method>\n"
" <method name=\"SetLocaliseQueriesOption\">\n"
" <arg name=\"localise-queries\" direction=\"in\" type=\"b\"/>\n"
" </method>\n"
@@ -817,6 +823,14 @@
DBusHandlerResult message_handler(DBusConnection *connection,
{
reply = dbus_set_bool(message, OPT_FILTER, "filterwin2k");
}
+ else if (strcmp(method, "SetFilterA") == 0)
+ {
+ reply = dbus_set_bool(message, OPT_FILTER_A, "filter-a");
+ }
+ else if (strcmp(method, "SetFilterAAAA") == 0)
+ {
+ reply = dbus_set_bool(message, OPT_FILTER_AAAA, "filter-aaaa");
+ }
else if (strcmp(method, "SetLocaliseQueriesOption") == 0)
{
reply = dbus_set_bool(message, OPT_LOCALISE, "localise-queries");
--
2.39.1
Loading