Merge branch 'master' of github.com:RoryO/ruby-net-ldap

Author: Rory O'Connell

.gitignore

@@ -1,3 +1,5 @@
+spec/ldap.yml
+.rvmrc
 *.gemspec
 pkg/
 *.swp

lib/net/ldap.rb

@@ -532,7 +532,7 @@ def get_operation_result
     else
       os.code = 0
     end
-    os.message = LDAP.result2string(os.code)
+    os.message = Net::LDAP.result2string(os.code)
     os
   end
 
@@ -1170,7 +1170,7 @@ def setup_encryption(args)
       # go here.
     when :start_tls
       msgid = next_msgid.to_ber
-      request = [StartTlsOid.to_ber].to_ber_appsequence(Net::LDAP::PDU::ExtendedRequest)
+      request = [Net::LDAP::StartTlsOid.to_ber].to_ber_appsequence(Net::LDAP::PDU::ExtendedRequest)
       request_pkt = [msgid, request].to_ber_sequence
       @conn.write request_pkt
       be = @conn.read_ber(Net::LDAP::AsnSyntax)