Merge remote-tracking branch 'shared/master'

Conflicts:
	manifests/init.pp

diff --cc manifests/init.pp
index 62d055d916506db1ff645081a3188e8f09fdf716,c85d3d6ed6e2c2de78a281d71eb1e10c2255fa3e..d005d60f09e18125d92ce38b26bf14599009df68
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -34,17 -34,15 +34,21 @@@ class sshd
    $print_motd = 'yes',
    $manage_shorewall = false,
    $shorewall_source = 'net',
-   $sshkey_ipaddress = $::ipaddress
++  $sshkey_ipaddress = $::ipaddress,
+   $manage_client = true,
  ) {
  
-   class{'sshd::client':
-     shared_ip        => $sshd::shared_ip,
-     ensure_version   => $sshd::ensure_version,
-     manage_shorewall => $manage_shorewall,
 +  validate_bool($manage_shorewall)
++  validate_bool($manage_client)
 +  validate_array($listen_address)
 +  validate_array($ports)
 +
 -      shared_ip        => $sshd::shared_ip,
 -      ensure_version   => $sshd::ensure_version,
+   if $manage_client {
+     class{'sshd::client':
++      shared_ip        => $shared_ip,
++      ensure_version   => $ensure_version,
+       manage_shorewall => $manage_shorewall,
+     }
    }
  
    case $::operatingsystem {