Merge branch 'master' of github.com:djjudas21/puppet-freeradius

manifests/statusclient.pp

@@ -14,6 +14,19 @@
   $fr_group    = $::freeradius::params::fr_group
   $fr_version  = $::freeradius::params::fr_version
 
+  $cidr = $netmask ? {
+    undef   => $ip,
+    default => "${ip}/${netmask}",
+  }
+  $cidr6 = $netmask ? {
+    undef   => $ip6,
+    default => "${ip6}/${netmask}",
+  }
+
+  if ($netmask and $fr_version == 3) {
+    warning("netmask field found in client ${shortname} is deprecated, use CIDR notation instead. Please fix your configuration.")
+  }
+
   file { "${fr_basepath}/statusclients.d/${name}.conf":
     ensure  => $ensure,
     mode    => '0640',

templates/radiusd.conf.fr3.erb

@@ -474,6 +474,15 @@ security {
 	#
 	status_server = yes
 
+        #  allow_vulnerable_openssl: Allow the server to start with
+        #  versions of OpenSSL known to have critical vulnerabilities.
+        #
+        #  This check is based on the version number reported by libssl
+        #  and may not reflect patches applied to libssl by
+        #  distribution maintainers.
+        #
+        allow_vulnerable_openssl = yes
+
 
 }