From 32bdfdd20dedc44eefedb2dc0178f761599439c8 Mon Sep 17 00:00:00 2001
From: Anders Larsson <anders.x.larsson@ericsson.com>
Date: Tue, 16 Feb 2016 12:35:40 +0100
Subject: [PATCH] Add UseRoaming only on supported ssh versions

Facts ssh_version and ssh_version_numeric is now used in the decision of
including UseRoaming in ssh_version.
---
 manifests/init.pp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 5028296..ce4ccbc 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -108,7 +108,6 @@ class ssh (
       $default_ssh_package_source              = undef
       $default_ssh_package_adminfile           = undef
       $default_ssh_sendenv                     = true
-      $default_ssh_config_use_roaming          = 'no'
       $default_sshd_config_subsystem_sftp      = '/usr/libexec/openssh/sftp-server'
       $default_sshd_config_mode                = '0600'
       $default_sshd_config_use_dns             = 'yes'
@@ -129,7 +128,6 @@ class ssh (
       $default_ssh_package_source              = undef
       $default_ssh_package_adminfile           = undef
       $default_ssh_sendenv                     = true
-      $default_ssh_config_use_roaming          = 'no'
       $default_ssh_config_forward_x11_trusted  = 'yes'
       $default_sshd_config_mode                = '0600'
       $default_sshd_config_use_dns             = 'yes'
@@ -167,7 +165,6 @@ class ssh (
       $default_ssh_package_source              = undef
       $default_ssh_package_adminfile           = undef
       $default_ssh_sendenv                     = true
-      $default_ssh_config_use_roaming          = 'no'
       $default_sshd_config_subsystem_sftp      = '/usr/lib/openssh/sftp-server'
       $default_sshd_config_mode                = '0600'
       $default_sshd_config_use_dns             = 'yes'
@@ -185,7 +182,6 @@ class ssh (
       $default_ssh_config_hash_known_hosts     = undef
       $default_ssh_sendenv                     = false
       $default_ssh_config_forward_x11_trusted  = undef
-      $default_ssh_config_use_roaming          = 'unset'
       $default_sshd_config_subsystem_sftp      = '/usr/lib/ssh/sftp-server'
       $default_sshd_config_mode                = '0644'
       $default_sshd_config_use_dns             = undef
@@ -237,6 +233,21 @@ class ssh (
     }
   }
 
+  if $::ssh_version =~ /^OpenSSH/  {
+    $ssh_version_array = split($::ssh_version_numeric, '\.')
+    $ssh_version_maj_int = 0 + $ssh_version_array[0]
+    $ssh_version_min_int = 0 + $ssh_version_array[1]
+    if $ssh_version_maj_int > 5 {
+      $default_ssh_config_use_roaming = 'no'
+    } elsif $ssh_version_maj_int == 5 and $ssh_version_min_int >= 4 {
+      $default_ssh_config_use_roaming = 'no'
+    } else {
+      $default_ssh_config_use_roaming = 'unset'
+    }
+  } else {
+      $default_ssh_config_use_roaming = 'unset'
+  }
+
   if $packages == 'USE_DEFAULTS' {
     $packages_real = $default_packages
   } else {