diff options
author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-05-17 18:39:43 +0000 |
---|---|---|
committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-05-17 18:39:43 +0000 |
commit | 3e51a5b1b5a953e4705adc924355ffdc83b25472 (patch) | |
tree | be35b23555d126828b03f9969c7dca0861fa0017 /lib | |
parent | 35e731649da88fda916509eb1cb0a745d772f21c (diff) |
o protocol.rb: Protocol#start yields self
o smtp.rb: use Socket.gethostname to get localhost name
p pop.rb: use MD5#hexdigest
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@698 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/net/pop.rb | 12 | ||||
-rw-r--r-- | lib/net/protocol.rb | 8 | ||||
-rw-r--r-- | lib/net/smtp.rb | 5 |
3 files changed, 9 insertions, 16 deletions
diff --git a/lib/net/pop.rb b/lib/net/pop.rb index 046763e0a8..a6c002ce0c 100644 --- a/lib/net/pop.rb +++ b/lib/net/pop.rb @@ -337,20 +337,14 @@ Net::POP3 end - def auth( acnt, pass ) + def auth( account, pass ) critical { - @socket.writeline( "APOP #{acnt} #{digest(@stamp + pass)}" ) + @socket.writeline sprintf( 'APOP %s %s', + account, MD5.new(@stamp + pass).hexdigest ) check_reply_auth } end - - def digest( str ) - ret = '' - MD5.new( str ).digest.each_byte {|i| ret << sprintf('%02x', i) } - ret - end - end end diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index 1d909bbb4b..399b2bbdd4 100644 --- a/lib/net/protocol.rb +++ b/lib/net/protocol.rb @@ -15,8 +15,6 @@ require 'socket' module Net - Version = '1.1.17' - =begin == Net::Protocol @@ -68,7 +66,7 @@ Object class Protocol - Version = ::Net::Version + Version = '1.1.18' class << self @@ -165,7 +163,7 @@ Object connect do_start *args @active = true - yield if iterator? + yield self if iterator? ensure finish if iterator? end @@ -591,7 +589,7 @@ Object do_write_do D_CRLF wsize = do_write_fin - @pipe << "wrote #{wsize} bytes text" if pipeon + @pipe << "wrote #{wsize} bytes text\n" if pipeon wsize end diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb index fe3dd9e1b2..35e9118df8 100644 --- a/lib/net/smtp.rb +++ b/lib/net/smtp.rb @@ -109,9 +109,10 @@ Net::Protocol def do_start( helodom = nil, user = nil, secret = nil, authtype = nil ) unless helodom then - helodom = ENV['HOSTNAME'] || ENV['HOST'] + helodom = ::Socket.gethostname unless helodom then - raise ArgumentError, "cannot get hostname" + raise ArgumentError, + "cannot get localhost name; try 'smtp.start(local_host_name)'" end end |