Merge pull request #4105 from dmbaturin/T6739-quote-ipaddrcheck-args-correctlyT6732-reusable-build-package

validators: T6739: correctly quote ipaddrcheck arguments to avoid ipaddrcheck syntax errors when values include whitespace

15 files changed, 29 insertions, 29 deletions

diff --git a/src/validators/interface-address b/src/validators/interface-address
index 4c203956b..2a2583fc3 100755
--- a/src/validators/interface-address
+++ b/src/validators/interface-address
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-ipaddrcheck --is-ipv4-host $1 || ipaddrcheck --is-ipv6-host $1 
+ipaddrcheck --is-any-host "$1"
diff --git a/src/validators/ip-address b/src/validators/ip-address
index 11d6df09e..351f728a6 100755
--- a/src/validators/ip-address
+++ b/src/validators/ip-address
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-any-single $1
+ipaddrcheck --is-any-single "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not a valid IP address"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ip-cidr b/src/validators/ip-cidr
index 60d2ac295..8a01e7ad9 100755
--- a/src/validators/ip-cidr
+++ b/src/validators/ip-cidr
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-any-cidr $1
+ipaddrcheck --is-any-cidr "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not a valid IP CIDR"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ip-host b/src/validators/ip-host
index 77c578fa2..7c5ad2612 100755
--- a/src/validators/ip-host
+++ b/src/validators/ip-host
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-any-host $1
+ipaddrcheck --is-any-host "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not a valid IP host"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ip-prefix b/src/validators/ip-prefix
index e5a64fea8..25204ace5 100755
--- a/src/validators/ip-prefix
+++ b/src/validators/ip-prefix
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-any-net $1
+ipaddrcheck --is-any-net "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not a valid IP prefix"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ipv4 b/src/validators/ipv4
index 8676d5800..11f854cf1 100755
--- a/src/validators/ipv4
+++ b/src/validators/ipv4
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-ipv4 $1
+ipaddrcheck --is-ipv4 "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not IPv4"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ipv4-address b/src/validators/ipv4-address
index 058db088b..1cfd961ba 100755
--- a/src/validators/ipv4-address
+++ b/src/validators/ipv4-address
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-ipv4-single $1
+ipaddrcheck --is-ipv4-single "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not a valid IPv4 address"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ipv4-host b/src/validators/ipv4-host
index 74b8c36a7..eb8faaa2a 100755
--- a/src/validators/ipv4-host
+++ b/src/validators/ipv4-host
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-ipv4-host $1
+ipaddrcheck --is-ipv4-host "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not a valid IPv4 host"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ipv4-multicast b/src/validators/ipv4-multicast
index 3f28c51db..cf871bd59 100755
--- a/src/validators/ipv4-multicast
+++ b/src/validators/ipv4-multicast
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-ipv4-multicast $1 && ipaddrcheck --is-ipv4-single $1
+ipaddrcheck --is-ipv4-multicast "$1" && ipaddrcheck --is-ipv4-single "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not a valid IPv4 multicast address"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ipv4-prefix b/src/validators/ipv4-prefix
index 7e1e0e8dd..f8d46c69c 100755
--- a/src/validators/ipv4-prefix
+++ b/src/validators/ipv4-prefix
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-ipv4-net $1
+ipaddrcheck --is-ipv4-net "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not a valid IPv4 prefix"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ipv6 b/src/validators/ipv6
index 4ae130eb5..57696add7 100755
--- a/src/validators/ipv6
+++ b/src/validators/ipv6
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-ipv6 $1
+ipaddrcheck --is-ipv6 "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not IPv6"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ipv6-address b/src/validators/ipv6-address
index 1fca77668..460639090 100755
--- a/src/validators/ipv6-address
+++ b/src/validators/ipv6-address
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-ipv6-single $1
+ipaddrcheck --is-ipv6-single "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not a valid IPv6 address"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ipv6-host b/src/validators/ipv6-host
index 7085809a9..1eb4d8e35 100755
--- a/src/validators/ipv6-host
+++ b/src/validators/ipv6-host
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-ipv6-host $1
+ipaddrcheck --is-ipv6-host "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not a valid IPv6 host"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ipv6-multicast b/src/validators/ipv6-multicast
index 5aa7d734a..746ff7edf 100755
--- a/src/validators/ipv6-multicast
+++ b/src/validators/ipv6-multicast
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-ipv6-multicast $1 && ipaddrcheck --is-ipv6-single $1
+ipaddrcheck --is-ipv6-multicast "$1" && ipaddrcheck --is-ipv6-single "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not a valid IPv6 multicast address"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/validators/ipv6-prefix b/src/validators/ipv6-prefix
index 890dda723..1bb9b42fe 100755
--- a/src/validators/ipv6-prefix
+++ b/src/validators/ipv6-prefix
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ipaddrcheck --is-ipv6-net $1
+ipaddrcheck --is-ipv6-net "$1"
 
 if [ $? -gt 0 ]; then
     echo "Error: $1 is not a valid IPv6 prefix"
     exit 1
 fi
 
-exit 0
\ No newline at end of file
+exit 0