(GH-251) Fix regex for sshd_config_maxstartups

ghoneycutt · Nov 20, 2017 · cc2d310 · cc2d310
1 parent 3742a5c
commit cc2d310
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -557,9 +557,11 @@ Array of users for the AllowUsers setting in sshd_config.
 
 - *Default*: undef
 
-sshd_config_maxstartups
+sshd_config_maxstartups (string)
 -----------------------
-Specifies the maximum number of concurrent unauthenticated connections to the SSH daemon.
+Specifies the maximum number of concurrent unauthenticated connections
+to the SSH daemon. Must be a stringified integer or a string with three
+integers separated by colons, such as '10:30:100'.
 
 - *Default*: undef
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -632,7 +632,7 @@
   }
 
   if $sshd_config_maxstartups != undef {
-    validate_re($sshd_config_maxstartups,'^(\d+)+(\d+?:\d+?:\d+)?$',
+    validate_re($sshd_config_maxstartups,'^((\d+)|(\d+?:\d+?:\d+)?)$',
       "ssh::sshd_config_maxstartups may be either an integer or three integers separated with colons, such as 10:30:100. Detected value is <${sshd_config_maxstartups}>.")
   }