From ddd2a3e01b2f92952d035a5a5454c233be92ef3f Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sun, 22 Jan 2023 08:37:51 +0100
Subject: validators: T4798: replace python file-exists validator with
 file-path

(cherry-picked from commit 046bb9ccd56ac5e97c638bb4a9ca856d3d36026a)
---
 interface-definitions/interfaces-openvpn.xml.in | 10 +++++-----
 interface-definitions/protocols-rpki.xml.in     |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index 51e81390c..20a37ac48 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -643,7 +643,7 @@
                 <description>File in /config/auth directory</description>
               </valueHelp>
               <constraint>
-                <validator name="file-exists" argument="--directory /config/auth"/>
+                <validator name="file-path" argument="--strict --parent-dir /config/auth"/>
               </constraint>
             </properties>
           </leafNode>
@@ -660,7 +660,7 @@
                     <description>File in /config/auth directory</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="file-exists" argument="--directory /config/auth"/>
+                    <validator name="file-path" argument="--strict --parent-dir /config/auth"/>
                   </constraint>
                 </properties>
               </leafNode>
@@ -674,7 +674,7 @@
                     <description>File in /config/auth directory</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="file-exists" argument="--directory /config/auth"/>
+                    <validator name="file-path" argument="--strict --parent-dir /config/auth"/>
                   </constraint>
                 </properties>
               </leafNode>
@@ -686,7 +686,7 @@
                     <description>File in /config/auth directory</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="file-exists" argument="--directory /config/auth"/>
+                    <validator name="file-path" argument="--strict --parent-dir /config/auth"/>
                   </constraint>
                 </properties>
               </leafNode>
@@ -699,7 +699,7 @@
                     <description>File in /config/auth directory</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="file-exists" argument="--directory /config/auth"/>
+                    <validator name="file-path" argument="--strict --parent-dir /config/auth"/>
                   </constraint>
                 </properties>
               </leafNode>
diff --git a/interface-definitions/protocols-rpki.xml.in b/interface-definitions/protocols-rpki.xml.in
index 707eb4bf1..4714355bb 100644
--- a/interface-definitions/protocols-rpki.xml.in
+++ b/interface-definitions/protocols-rpki.xml.in
@@ -51,7 +51,7 @@
                     <properties>
                       <help>RPKI SSH known hosts file</help>
                       <constraint>
-                        <validator name="file-exists"/>
+                        <validator name="file-path"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -59,7 +59,7 @@
                     <properties>
                       <help>RPKI SSH private key file</help>
                       <constraint>
-                        <validator name="file-exists"/>
+                        <validator name="file-path"/>
                       </constraint>
                     </properties>
                   </leafNode>
@@ -67,7 +67,7 @@
                     <properties>
                       <help>RPKI SSH public key file path</help>
                       <constraint>
-                        <validator name="file-exists"/>
+                        <validator name="file-path"/>
                       </constraint>
                     </properties>
                   </leafNode>
-- 
cgit v1.2.3