diff --git a/manifests/init.pp b/manifests/init.pp index 66b872e..738b6b5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -422,9 +422,7 @@ class ssh ( fail('ssh::sshd_config_banner must be set to be able to use sshd_banner_content.') } - if $ssh_gssapiauthentication != undef { - validate_re($ssh_gssapiauthentication, '^(yes|no)$', "ssh::ssh_gssapiauthentication may be either 'yes' or 'no' and is set to <${ssh_gssapiauthentication}>.") - } + validate_re($ssh_gssapiauthentication, '^(yes|no)$', "ssh::ssh_gssapiauthentication may be either 'yes' or 'no' and is set to <${ssh_gssapiauthentication}>.") if $ssh_gssapidelegatecredentials != undef { validate_re($ssh_gssapidelegatecredentials, '^(yes|no)$', "ssh::ssh_gssapidelegatecredentials may be either 'yes' or 'no' and is set to <${ssh_gssapidelegatecredentials}>.") diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 0d641f6..962fd88 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -2288,7 +2288,7 @@ describe 'ssh' do it do expect { should contain_class('ssh') - }.to raise_error(Puppet::Error,/^ssh::ssh_gssapiauthentication may be either 'yes' or 'no' and is set to <#{value.to_s}>./) + }.to raise_error(Puppet::Error,/^ssh::ssh_gssapiauthentication may be either 'yes' or 'no' and is set to <#{value.to_s}>\./) end end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index dc7e9f4..2c6f566 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,2 +1 @@ -require 'rubygems' require 'puppetlabs_spec_helper/module_spec_helper'