From d371e3583e3b1e0692f92343017b62d2628190ff Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 19 May 2011 00:07:25 +0000
Subject: * lib: revert r31635-r31638 and untabify with expand(1).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/drb/ssl.rb | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'lib/drb/ssl.rb')

diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
index e15b5915c9..17e2a73d85 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -60,10 +60,10 @@ module DRb
           when 0; $stderr.putc "."  # BN_generate_prime
           when 1; $stderr.putc "+"  # BN_generate_prime
           when 2; $stderr.putc "*"  # searching good prime,
-            # n = #of try,
-            # but also data from BN_generate_prime
+                                    # n = #of try,
+                                    # but also data from BN_generate_prime
           when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
-            # but also data from BN_generate_prime
+                                    # but also data from BN_generate_prime
           else;   $stderr.putc "*"  # BN_generate_prime
           end
         }
@@ -82,16 +82,16 @@ module DRb
         cert.extensions = [
           ef.create_extension("basicConstraints","CA:FALSE"),
           ef.create_extension("subjectKeyIdentifier", "hash") ]
-          ef.issuer_certificate = cert
-          cert.add_extension(ef.create_extension("authorityKeyIdentifier",
-                                                 "keyid:always,issuer:always"))
-          if comment = self[:SSLCertComment]
-            cert.add_extension(ef.create_extension("nsComment", comment))
-          end
-          cert.sign(rsa, OpenSSL::Digest::SHA1.new)
+        ef.issuer_certificate = cert
+        cert.add_extension(ef.create_extension("authorityKeyIdentifier",
+                                               "keyid:always,issuer:always"))
+        if comment = self[:SSLCertComment]
+          cert.add_extension(ef.create_extension("nsComment", comment))
+        end
+        cert.sign(rsa, OpenSSL::Digest::SHA1.new)
 
-          @cert = cert
-          @pkey = rsa
+        @cert = cert
+        @pkey = rsa
       end
 
       def setup_ssl_context
@@ -117,7 +117,7 @@ module DRb
         [host, port, option]
       else
         raise(DRbBadScheme, uri) unless uri =~ /^drbssl:/
-          raise(DRbBadURI, 'can\'t parse uri:' + uri)
+        raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
     end
 
@@ -172,13 +172,13 @@ module DRb
 
     def accept
       begin
-        while true
-          soc = @socket.accept
-          break if (@acl ? @acl.allow_socket?(soc) : true)
-          soc.close
-        end
-        ssl = @config.accept(soc)
-        self.class.new(uri, ssl, @config, true)
+      while true
+        soc = @socket.accept
+        break if (@acl ? @acl.allow_socket?(soc) : true)
+        soc.close
+      end
+      ssl = @config.accept(soc)
+      self.class.new(uri, ssl, @config, true)
       rescue OpenSSL::SSL::SSLError
         warn("#{__FILE__}:#{__LINE__}: warning: #{$!.message} (#{$!.class})") if @config[:verbose]
         retry
-- 
cgit v1.2.3