ruby-ldap 0.9.19 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  metadata.gz: fbdef63d5618e4f8a8500c7afff630ba9622436f23ef7b5a7e16717d44aaf175f6932e90ca95afc8c5a5e2ff4e1a028a8e1e8ca4909260a9f563d8e33b42dc1e
-  data.tar.gz: 337ea5de70b3d724077e34700510f7c18f6bf574bdfa099c73507368a6883164ff25eecfa43cdc67c8340ad04229d1c2ec8fe1ea48ac7a7a0e60e9f0a300881a
-SHA1: 
-  metadata.gz: d7de5be007d5104fd3cfd75aeaee5170c5f8c5b4
-  data.tar.gz: e0fcbbcfce4ec9a65a213550e6c7228eafd27b2b
+---
+SHA1:
+  metadata.gz: d5badae0624830b9ac31009f196e4ed1887ec6fe
+  data.tar.gz: 2fc2844279fa77ca3fe2bfadd73c65a3bceff6eb
+SHA512:
+  metadata.gz: e4f59c4377592ddc1dac85e2292fb2930003e4c759c877f5b8ffe4c25f85911a0c61b10fcc041dfc5756e063ee75e3bc38dfa0899da9e3e317a55bdb49223238
+  data.tar.gz: cc58c3fc9734d0fd52c5b6bbc7aa7c22ffa335bc9e6d7a562bbe24eab8f48e4572fe0e32dbbbc2898323004ff9e925be488eea5291dcdadaa97a7a161c4035d0

data/ChangeLog

@@ -1,3 +1,7 @@
+Wed Jul 11 21:58:38 UTC 2018 Alexey Chebotar <alexey.chebotar@gmail.com>
+  * Version 0.9.20
+  * Added support of LDAP_OPT_X_TLS_NEWCTX. Thanks to Kouhei Sutou.
+
 Mon Jun 20 14:30:52 UTC 2016 Alexey Chebotar <alexey.chebotar@gmail.com>
   * Version 0.9.19
   * Fixed parsing of LDIF with CR LF line separators (GH-38).

data/NOTES

@@ -1,3 +1,9 @@
+0.9.20
+-----
+* Added support of LDAP_OPT_X_TLS_NEWCTX.
+  Thanks to Kouhei Sutou.
+
+
 0.9.19
 -----
 * Fixed parsing of LDIF with CR LF line separators (GH-38).

data/conn.c

@@ -502,6 +502,9 @@ rb_ldap_conn_set_option (VALUE self, VALUE opt, VALUE data)
 #ifdef LDAP_OPT_X_TLS_REQUIRE_CERT
     case LDAP_OPT_X_TLS_REQUIRE_CERT:
 #endif
+#ifdef LDAP_OPT_X_TLS_NEWCTX
+    case LDAP_OPT_X_TLS_NEWCTX:
+#endif
 #endif
       idata = NUM2INT (data);
       optdata = &idata;

data/ldap.c

@@ -496,6 +496,9 @@ Init_ldap ()
 #ifdef LDAP_OPT_X_TLS_RANDOM_FILE
   rb_ldap_define_opt (LDAP_OPT_X_TLS_RANDOM_FILE);
 #endif
+#ifdef LDAP_OPT_X_TLS_NEWCTX
+  rb_ldap_define_opt (LDAP_OPT_X_TLS_NEWCTX);
+#endif
 #ifdef LDAP_OPT_X_TLS_NEVER
   rb_ldap_define_opt (LDAP_OPT_X_TLS_NEVER);
 #endif

data/rbldap.h

@@ -27,8 +27,8 @@
 
 #define RB_LDAP_MAJOR_VERSION 0
 #define RB_LDAP_MINOR_VERSION 9
-#define RB_LDAP_PATCH_VERSION 19
-#define RB_LDAP_VERSION "0.9.19"
+#define RB_LDAP_PATCH_VERSION 20
+#define RB_LDAP_VERSION "0.9.20"
 
 #define LDAP_GET_OPT_MAX_BUFFER_SIZE    (1024)	/* >= sizeof(LDAPAPIInfo) */
 

data/test/bind-ldaps.rb

@@ -11,7 +11,7 @@ when /^OpenLDAP/i
   conn = LDAP::SSLConn.new($HOST, $SSLPORT, false)
 when /^Netscape/i
   conn = LDAP::SSLConn.new($HOST, $SSLPORT,
-			   false, File.expand_path("~/.netscape/cert7.db"))
+                           false, File.expand_path("~/.netscape/cert7.db"))
   conn.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3)
 else
   raise(RuntimeError, "unknown vendor")

data/test/bind-ssl.rb

@@ -11,7 +11,7 @@ when /^OpenLDAP/i
   conn = LDAP::SSLConn.new($HOST, $PORT, true)
 when /^Netscape/i
   conn = LDAP::SSLConn.new($HOST, $SSLPORT,
-			   false, File.expand_path("~/.netscape/cert7.db"))
+                           false, File.expand_path("~/.netscape/cert7.db"))
   conn.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3)
 else
   raise(RuntimeError, "unknown vendor")

data/test/bind.rb

@@ -20,7 +20,7 @@ conn.bind{
       info = nil
     end
     print("host = #{host}, proto = #{proto}\n",
-  	  "info.protocol_version = #{info.protocol_version}\n")
+          "info.protocol_version = #{info.protocol_version}\n")
   end
 }
 

data/test/compare.rb

@@ -9,7 +9,7 @@ LDAP::Conn.new($HOST, $PORT).bind{|conn|
   conn.perror("bind")
   begin
     conn.compare("cn=Takaaki Tateishi, dc=localhost, dc=localdomain",
-		 "cn", "Takaaki Tateishi")
+                 "cn", "Takaaki Tateishi")
   rescue LDAP::ResultError
     exit(0)
   end

data/test/ext.rb

@@ -11,9 +11,9 @@ conn.bind('cn=root, dc=localhost, dc=localdomain','secret'){
   begin
     (1..200).each{|i|
       entry = {
-	'objectclass' => ['top', 'person'],
-	'cn'          => ["User #{i}"],
-	'sn'          => ["user#{i}"],
+        'objectclass' => ['top', 'person'],
+        'cn'          => ["User #{i}"],
+        'sn'          => ["user#{i}"],
       }
       conn.add("cn=User #{i}, dc=localhost, dc=localdomain", entry)
     }
@@ -30,12 +30,12 @@ conn.bind('cn=root, dc=localhost, dc=localdomain','secret'){
   users = []
   begin
     conn.search_ext("dc=localhost, dc=localdomain",
-		    LDAP::LDAP_SCOPE_SUBTREE,
-		    "(&(objectclass=*)(cn=User*))",
-		    nil, false,    # attrs, attrsonly
-		    nil, nil,      # serverctrls, clientctrls
-		    0, 0,          # sec, usec
-		    100){|e|       # sizelimit
+                    LDAP::LDAP_SCOPE_SUBTREE,
+                    "(&(objectclass=*)(cn=User*))",
+                    nil, false,    # attrs, attrsonly
+                    nil, nil,      # serverctrls, clientctrls
+                    0, 0,          # sec, usec
+                    100){|e|       # sizelimit
       users.push(e.vals("sn"))
     }
   rescue LDAP::ResultError

data/test/modrdn.rb

@@ -14,8 +14,8 @@ rescue LDAP::ResultError => e
   conn.bind('cn=root, dc=localhost, dc=localdomain','secret'){
     conn.perror("bind")
     conn.modrdn("cn=Takaaki Tateishi, dc=localhost, dc=localdomain",
-		"cn=Takaaki-Tateishi",
-		true)
+                "cn=Takaaki-Tateishi",
+                true)
     conn.perror("modrdn")
   }
   exit(0)

data/test/moz_cert.rb

@@ -6,8 +6,8 @@ require 'optparse'
 require 'pp'
 
 options = {
-  :host	  => 'localhost',
-  :port	  => '389',
+  :host   => 'localhost',
+  :port   => '389',
   :scope  => 'base',
   :filter => '(objectclass=*)',
   :key_pw => ''
@@ -15,44 +15,44 @@ options = {
 
 optparse = OptionParser.new do |opts|
   opts.on("-P", "--certpath [CERTFILE]", "cert8 path") do |cp|
-	options[:cp] = cp
+    options[:cp] = cp
   end
 
   opts.on("-N", "--certname [CERTNAME]", "certificate name") do |opt|
-	options[:cn] = opt
+    options[:cn] = opt
   end
 
   opts.on("-W", "--keypassword PASSWORD", "key password") do |opt|
-	options[:key_pw] = opt
+    options[:key_pw] = opt
   end
 
   opts.on("-h", "--host HOST", "server hostname") do |host|
-	options[:host] = host
+    options[:host] = host
   end
 
   opts.on("-p", "--port PORT", "server port") do |opt|
-	options[:port] = opt
+    options[:port] = opt
   end
 
   opts.on("-b", "--base [BASE]", "search base") do |opt|
-	options[:base] = opt
+    options[:base] = opt
   end
 
   opts.on("-s", "--scope SCOPE", "search scope") do |opt|
-	options[:scope] = opt
+    options[:scope] = opt
   end
 
   opts.on("-f", "--filter FILTER", "search filter") do |opt|
-	options[:filter] = opt
+    options[:filter] = opt
   end
 
   opts.on("-a", "--attributes ATTRS", "attrs to return") do |opt|
-	options[:attrs] = opt.split(/ *, */)
+    options[:attrs] = opt.split(/ *, */)
   end
 
   opts.on("--help") do |opt|
-	puts opts
-	exit 0
+    puts opts
+    exit 0
   end
 end
 
@@ -80,7 +80,7 @@ raise ArgumentError.new("cert file's missing") unless (File.exists? options[:cp]
 
 # Connect
 conn = LDAP::SSLAuthConn.new(options[:host], options[:port].to_i, true, 
-			    File.expand_path(options[:cp]), options[:cn], options[:key_pw])
+                File.expand_path(options[:cp]), options[:cn], options[:key_pw])
 conn.set_option(LDAP::LDAP_OPT_PROTOCOL_VERSION, 3)
 
 
@@ -93,7 +93,7 @@ begin
 
   results = {}
   conn.search(options[:base], options[:scope], options[:filter], options[:attrs], false, 10) do |entry|
-	results[entry.dn] = entry.to_hash
+    results[entry.dn] = entry.to_hash
   end
 
   pp results

data/test/search.rb

@@ -9,8 +9,8 @@ LDAP::Conn.new($HOST, $PORT).bind{|conn|
   conn.perror("bind")
   begin
     conn.search("dc=localhost, dc=localdomain",
-		LDAP::LDAP_SCOPE_SUBTREE,
-		"(objectclass=*)"){|e|
+                LDAP::LDAP_SCOPE_SUBTREE,
+                "(objectclass=*)"){|e|
       p e.vals("cn")
       p e.to_hash()
     }

data/test/search2.rb

@@ -14,7 +14,7 @@ LDAP::Conn.new($HOST, $PORT).bind{|conn|
   conn.perror("bind")
   sub = nil
   conn.search("dc=localhost, dc=localdomain", LDAP::LDAP_SCOPE_SUBTREE,
-	      "(objectclass=*)", nil, false, 0, 0, "sn", sorter){|e|
+              "(objectclass=*)", nil, false, 0, 0, "sn", sorter){|e|
     dn = e.dn
     print("# #{LDAP.dn2ufn(dn)}\n")
     print("dn: #{dn}\n")
@@ -29,6 +29,6 @@ LDAP::Conn.new($HOST, $PORT).bind{|conn|
     sub.dn
   rescue LDAP::InvalidEntryError => e
     $stderr.print("#{e.to_s}.\n",
-		  "This exception is expected.\n")
+                  "This exception is expected.\n")
   end
 }

data/test/search3.rb

@@ -13,7 +13,7 @@ conn.bind{
   # search2 returns an array of hash
   print("search2 without a block:\n")
   conn.search2("dc=localhost, dc=localdomain", LDAP::LDAP_SCOPE_SUBTREE,
-	       "(objectclass=*)", nil, false, 0, 0).each{|ent|
+               "(objectclass=*)", nil, false, 0, 0).each{|ent|
     ent.each{|attr,vals|
       print("#{attr}: #{vals.join(', ')}\n")
     }

data/test/setup.rb

@@ -18,9 +18,9 @@ class TC_LDAPTest < Test::Unit::TestCase
           if line =~ /^host\s+(\S+)$/
             @@host = $1
             break
-	  elsif line =~ /^base\s+(\S+)$/
-	    @@base = $1
-	    break
+          elsif line =~ /^base\s+(\S+)$/
+            @@base = $1
+            break
           end
         end
       end

data/test/tc_conn.rb

@@ -120,5 +120,4 @@ class TC_ConnectionTest < TC_LDAPTest
     @@conn = nil
   end
 
-
 end

data/test/tc_ldif.rb

@@ -86,7 +86,7 @@ class TC_LDIFTest < Test::Unit::TestCase
     ldif = File.open( 'data/ldif12.txt' ) { |f| f.readlines }
     entry = LDAP::LDIF.parse_entry( ldif )
     assert( entry.mods.keys.include?( LDAP::LDAP_MOD_REPLACE |
-				      LDAP::LDAP_MOD_BVALUES ) )
+                                      LDAP::LDAP_MOD_BVALUES ) )
   end
 
   def test_change_record_control
@@ -109,9 +109,9 @@ class TC_LDIFTest < Test::Unit::TestCase
 
   def test_mod_to_ldif
     mod = LDAP.mod( LDAP::LDAP_MOD_ADD | LDAP::LDAP_MOD_BVALUES,
-		    'mailRoutingAddress', ['a', 'b'] )
+                    'mailRoutingAddress', ['a', 'b'] )
     assert_instance_of( LDAP::LDIF::Mod,
-		        mod.to_ldif( 'uid=foo,dc=example,dc=com' ) )
+                        mod.to_ldif( 'uid=foo,dc=example,dc=com' ) )
     assert_equal( <<LDIF, mod.to_ldif( 'uid=foo,dc=example,dc=com' ) )
 dn: uid=foo,dc=example,dc=com
 changetype: add
@@ -120,7 +120,7 @@ mailRoutingAddress: b
 LDIF
 
     mod = LDAP.mod( LDAP::LDAP_MOD_REPLACE | LDAP::LDAP_MOD_BVALUES,
-		    'mailRoutingAddress', ['a', 'b'] )
+                    'mailRoutingAddress', ['a', 'b'] )
     assert_equal( <<LDIF, mod.to_ldif( 'uid=foo,dc=example,dc=com' ) )
 dn: uid=foo,dc=example,dc=com
 changetype: modify

data/test/tc_search.rb

@@ -16,17 +16,17 @@ class TC_SearchTest < TC_LDAPTest
   def test_attrs
     assert_raise( TypeError ) do
       @@conn.search( @@naming_context, LDAP::LDAP_SCOPE_ONELEVEL,
-		     '(objectClass=*)', false )
+                     '(objectClass=*)', false )
     end
 
     @@conn.search( @@naming_context, LDAP::LDAP_SCOPE_ONELEVEL,
-		   '(objectClass=*)', [], true ) do |x|
+                   '(objectClass=*)', [], true ) do |x|
       assert_nil( x['objectClass'] )
       break
     end
 
     @@conn.search( @@naming_context, LDAP::LDAP_SCOPE_ONELEVEL,
-		   '(objectClass=*)', 'objectClass' ) do |x|
+                   '(objectClass=*)', 'objectClass' ) do |x|
       x = x.to_hash
       x.delete( 'dn' )
       assert( x.to_hash.keys == [ 'objectClass' ] )
@@ -39,14 +39,14 @@ class TC_SearchTest < TC_LDAPTest
   def test_sort_attr
     ou = []
     @@conn.search( @@naming_context, LDAP::LDAP_SCOPE_ONELEVEL,
-		   '(ou=*)' ) do |x|
+                   '(ou=*)' ) do |x|
       ou << x['ou']
     end
     ou.flatten!
 
     sorted_ou = []
     @@conn.search( @@naming_context, LDAP::LDAP_SCOPE_ONELEVEL,
-		   '(ou=*)', nil, nil, 0, 0, 'ou' ) do |x|
+                   '(ou=*)', nil, nil, 0, 0, 'ou' ) do |x|
       sorted_ou << x['ou']
     end
     sorted_ou.flatten!
@@ -60,7 +60,7 @@ class TC_SearchTest < TC_LDAPTest
   def test_sort_proc
     ct = []
     @@conn.search( @@naming_context, LDAP::LDAP_SCOPE_ONELEVEL,
-		   '(objectClass=*)', [ 'createTimestamp' ] ) do |x|
+                   '(objectClass=*)', [ 'createTimestamp' ] ) do |x|
       ct << x['createTimestamp']
     end
     ct.flatten!
@@ -68,8 +68,8 @@ class TC_SearchTest < TC_LDAPTest
     sorted_ct = []
     s_proc = proc { |a,b| b <=> a }
     @@conn.search( @@naming_context, LDAP::LDAP_SCOPE_ONELEVEL,
-		   '(objectClass=*)', [ 'createTimestamp' ], nil, 0, 0,
-		   'createTimestamp', s_proc ) do |x|
+                   '(objectClass=*)', [ 'createTimestamp' ], nil, 0, 0,
+                   'createTimestamp', s_proc ) do |x|
       sorted_ct << x['createTimestamp']
     end
     sorted_ct.flatten!
@@ -88,20 +88,20 @@ class TC_SearchTest < TC_LDAPTest
     loop do
       ber_string = LDAP::Control.encode( page_size, cookie )
       ctrl = LDAP::Control.new( LDAP::LDAP_CONTROL_PAGEDRESULTS,
-			        ber_string,
-				true )
+                                ber_string,
+                                true )
       @@conn.set_option( LDAP::LDAP_OPT_SERVER_CONTROLS, [ ctrl ] )
 
       this_page = nil
       assert_nothing_raised do
-	begin
+        begin
           this_page = @@conn.search2( @@naming_context,
-				      LDAP::LDAP_SCOPE_ONELEVEL,
-				      '(objectclass=*)' )
-	rescue LDAP::ResultError
-	  @@conn = nil
-	  raise
-	end
+                                      LDAP::LDAP_SCOPE_ONELEVEL,
+                                      '(objectclass=*)' )
+        rescue LDAP::ResultError
+          @@conn = nil
+          raise
+        end
       end
       total += this_page.size
       assert_equal( page_size, this_page.size )
@@ -126,7 +126,7 @@ class TC_SearchTest < TC_LDAPTest
     setup
 
     unpaged = @@conn.search2( @@naming_context, LDAP::LDAP_SCOPE_ONELEVEL,
-			      '(objectclass=*)' )
+                              '(objectclass=*)' )
 
     # Does the total number of results match the equivalent unpaged search?
     # This has a race condition, but we assume the number of top-level OUs is

metadata

@@ -1,38 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-ldap
-version: !ruby/object:Gem::Version 
-  version: 0.9.19
+version: !ruby/object:Gem::Version
+  version: 0.9.20
 platform: ruby
-authors: 
+authors:
 - Alexey Chebotar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2016-06-20 00:00:00 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies: []
+description: 'It provides the interface to some LDAP libraries (e.g. OpenLDAP, Netscape
+  SDK and Active Directory). The common API for application development is described
+  in RFC1823 and is supported by Ruby/LDAP.
 
-description: |
-  It provides the interface to some LDAP libraries (e.g. OpenLDAP, Netscape SDK and Active Directory). The common API for application development is described in RFC1823 and is supported by Ruby/LDAP.
-
+'
 email: alexey.chebotar@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - extconf.rb
 extra_rdoc_files: []
-
-files: 
-- ChangeLog
+files:
 - COPYING
+- ChangeLog
 - FAQ
 - NOTES
 - README
 - TODO
+- clientauth.c
+- conn.c
+- entry.c
 - extconf.rb
+- ldap.c
 - lib/ldap/control.rb
 - lib/ldap/ldif.rb
 - lib/ldap/schema.rb
+- misc.c
+- mod.c
+- rbldap.h
+- saslconn.c
+- sslconn.c
 - test/add.rb
 - test/add2.rb
 - test/add3.rb
@@ -58,55 +65,30 @@ files:
 - test/tc_schema.rb
 - test/tc_search.rb
 - test/ts_ldap.rb
-- rbldap.h
-- test/openldap_tests/progs/slapd-common.h
 - win/winlber.h
 - win/winldap.h
-- clientauth.c
-- conn.c
-- entry.c
-- ldap.c
-- misc.c
-- mod.c
-- saslconn.c
-- sslconn.c
-- test/openldap_tests/progs/ldif-filter.c
-- test/openldap_tests/progs/slapd-addel.c
-- test/openldap_tests/progs/slapd-auth.c
-- test/openldap_tests/progs/slapd-bind.c
-- test/openldap_tests/progs/slapd-common.c
-- test/openldap_tests/progs/slapd-modify.c
-- test/openldap_tests/progs/slapd-modrdn.c
-- test/openldap_tests/progs/slapd-mtread.c
-- test/openldap_tests/progs/slapd-read.c
-- test/openldap_tests/progs/slapd-search.c
-- test/openldap_tests/progs/slapd-tester.c
 - win/wldap32.def
 homepage: http://ruby-ldap.sourceforge.net/
 licenses: []
-
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id001 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id001
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ruby-ldap
-rubygems_version: 2.0.17
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby/LDAP is an extension module for Ruby
 test_files: []
-