From: Martin Kletzander <mkletzan@redhat.com>
Date: Thu, 11 Nov 2021 14:44:58 +0000 (+0100)
Subject: docs: Simplify explanation of tls_allowed_dn_list wildcards
X-Git-Tag: v7.10.0-rc1~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=555c24a55dca000d028a429591c7ea1ad54a6f43;p=thirdparty%2Flibvirt.git

docs: Simplify explanation of tls_allowed_dn_list wildcards

This removes a dead link, the need for users to understand a glib function and a
improper reference to fnmatch (as we only expand asterisks to any string).

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/docs/remote.html.in b/docs/remote.html.in
index cc8db80c95..66f56a3a64 100644
--- a/docs/remote.html.in
+++ b/docs/remote.html.in
@@ -249,8 +249,8 @@ Blank lines and comments beginning with <code>#</code> are ignored.
   </p>
           <p>
   This list may contain wildcards such as <code>"C=GB,ST=London,L=London,O=Libvirt Project,CN=*"</code>
-  See the POSIX <code>fnmatch</code> function for the format
-  of the wildcards.
+  Any * matches in the string matches any number of consecutive characters,
+  like a simplified <code>glob(7)</code>.
   </p>
           <p>
   Note that if this is an empty list, <i>no client can connect</i>.
diff --git a/src/remote/libvirtd.conf.in b/src/remote/libvirtd.conf.in
index 8e709856aa..b18c5885a1 100644
--- a/src/remote/libvirtd.conf.in
+++ b/src/remote/libvirtd.conf.in
@@ -290,9 +290,7 @@
 #
 #    "C=GB,ST=London,L=London,O=Red Hat,CN=*"
 #
-# See the g_pattern_match function for the format of the wildcards:
-#
-# https://developer.gnome.org/glib/stable/glib-Glob-style-pattern-matching.html
+# Any * matches any number of consecutive spaces, like a simplified glob(7).
 #
 # NB If this is an empty list, no client can connect, so comment out
 # entirely rather than using empty list to disable these checks
diff --git a/tests/virconfdata/libvirtd.conf b/tests/virconfdata/libvirtd.conf
index 6d1fd33dcd..e850e1b873 100644
--- a/tests/virconfdata/libvirtd.conf
+++ b/tests/virconfdata/libvirtd.conf
@@ -183,9 +183,8 @@ tls_no_verify_certificate = 1
 #
 #    "C=GB,ST=London,L=London,O=Red Hat,CN=*"
 #
-# See the g_pattern_match function for the format of the wildcards.
+# Any * matches any number of consecutive spaces, like a simplified glob(7).
 #
-# https://developer.gnome.org/glib/stable/glib-Glob-style-pattern-matching.html
 #
 # NB If this is an empty list, no client can connect, so comment out
 # entirely rather than using empty list to disable these checks
diff --git a/tests/virconfdata/libvirtd.out b/tests/virconfdata/libvirtd.out
index ce50480b8c..0755c5dc0a 100644
--- a/tests/virconfdata/libvirtd.out
+++ b/tests/virconfdata/libvirtd.out
@@ -147,9 +147,8 @@ tls_no_verify_certificate = 1
 #
 #    "C=GB,ST=London,L=London,O=Red Hat,CN=*"
 #
-# See the g_pattern_match function for the format of the wildcards.
+# Any * matches any number of consecutive spaces, like a simplified glob(7).
 #
-# https://developer.gnome.org/glib/stable/glib-Glob-style-pattern-matching.html
 #
 # NB If this is an empty list, no client can connect, so comment out
 # entirely rather than using empty list to disable these checks