From 17058a53ce6e6038396958f84420a02e738d4d69 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Fri, 16 Jul 2021 10:56:03 -0700 Subject: firewalld rich rules: fix escaping Signed-off-by: Sean Whitton --- src/property/firewalld.lisp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/property/firewalld.lisp b/src/property/firewalld.lisp index aad7fb5..a39b22c 100644 --- a/src/property/firewalld.lisp +++ b/src/property/firewalld.lisp @@ -186,17 +186,17 @@ only FIREWALLD:DEFAULT-ZONE." (:desc #?"firewalld zone ${zone} has rich rule \"${rule}\"") (:check (zerop (mrun :for-exit "firewall-cmd" "--permanent" #?"--zone=${zone}" - (strcat "--query-rich-rule=" (escape-sh-token rule))))) + (strcat "--query-rich-rule=" rule)))) (with-unapply (installed) (has-zone zone) (%firewall-cmd #?"zones/${zone}.xml" "ALREADY_ENABLED" "--permanent" #?"--zone=${zone}" - (strcat "--add-rich-rule=" (escape-sh-token rule))) + (strcat "--add-rich-rule=" rule)) :unapply (%firewall-cmd #?"zones/${zone}.xml" "NOT_ENABLED" "--permanent" #?"--zone=${zone}" - (strcat "--remove-rich-rule=" (escape-sh-token rule))))) + (strcat "--remove-rich-rule=" rule)))) ;; Note that direct rules will be deprecated as of firewalld 1.0.0, as ;; policies and rich rules should be able to cover all uses of direct rules. -- cgit v1.2.3