Merge remote-tracking branch 'upstream/master'

* upstream/master: (109 commits)
  delete secret password if it is called secret
  bump up version
  update changelogs
  Recursively search from one dir above specified
  Fix suggested by ytti for issue #610
  Remove trailing whitespace and enable prompt detection
  Update eos.rb
  exclude time from output
  New hook: awssns - Publish messages to AWS SNS topics
  Updated config options
  Added option to disable ssl verification checks for http source
  Update ciscosmb.rb
  Update ciscosmb.rb
  Update ciscosmb.rb
  expect prompt after entering enable password
  add support for PLANET SG switches
  renamed  alvarion -> alvarion.rb
  This adds support for Hatteras Networks devices
  This adds support for D-Link switches
  This adds support for the Casa C1G CMTS
  ...

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index 3ef9a85..e5501d5 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -33,14 +33,13 @@ class CiscoSMB < Oxidized::Model
     cfg
   end
 
-  cfg :telnet do
-    username /^User Name:/
-    password /^\r?Password:$/
-  end
-
   cfg :telnet, :ssh do
+    username /^User ?[nN]ame:/
+    password /^\r?Password:$/
     post_login 'terminal datadump' # Disable pager
     post_login 'terminal width 0'
+    post_login 'terminal len 0'
+    pre_logout 'exit' #exit returns to previous priv level, no way to quit from exec(#)
     pre_logout 'exit'
   end