Merge pull request #112 from ClogenyTechnologies/sid/winrm-backward-s…

…upport-comments

Added changes to remove check for local domain for winrm-s use

lib/chef/knife/winrm.rb

@@ -142,8 +142,7 @@ def session_from_list(list)
           session_opts[:operation_timeout] = 1800 # 30 min OperationTimeout for long bootstraps fix for KNIFE_WINDOWS-8
 
           ## If you have a \\ in your name you need to use NTLM domain authentication
-          username_components = session_opts[:user].split("\\")
-          username_contains_domain = username_components.length.eql?(2)
+          username_contains_domain = session_opts[:user].split("\\").length.eql?(2)
 
           if username_contains_domain
             # We cannot use basic_auth for domain authentication
@@ -158,7 +157,7 @@ def session_from_list(list)
           else
             session_opts[:transport] = (Chef::Config[:knife][:winrm_transport] || config[:winrm_transport]).to_sym
 
-            if Chef::Platform.windows? && session_opts[:transport] == :plaintext && username_contains_domain && username_components[0] != "."
+            if Chef::Platform.windows? && session_opts[:transport] == :plaintext && username_contains_domain
               ui.warn("Switching to Negotiate authentication, Basic does not support Domain Authentication")
               # windows - force only encrypted communication
               require 'winrm-s'

spec/unit/knife/winrm_spec.rb

@@ -199,7 +199,7 @@
             it "should skip winrm monkey patched for windows" do
               @winrm.config[:winrm_user] = ".\\testuser"
               allow(Chef::Platform).to receive(:windows?).and_return(true)
-              expect(@winrm).to_not receive(:require).with('winrm-s')
+              expect(@winrm).to receive(:require).with('winrm-s')
 
               exit_code = @winrm.run
             end