Merge pull request #18 from doitian/issue/17_bererror_unsupported_object_type_id_139

Do not add controls when it is empty. Fixed #17
2011-12-04 22:32:32 -08:00 · 2011-12-04 22:32:32 -08:00 · a1bf790784
parent 6bb9fa6ae6 f102f50d9c
commit a1bf790784
1 changed files with 2 additions and 2 deletions
--- a/lib/net/ldap.rb
+++ b/lib/net/ldap.rb
@ -1394,9 +1394,9 @@ class Net::LDAP::Connection #:nodoc:
          false.to_ber,
          rfc2696_cookie.map{ |v| v.to_ber}.to_ber_sequence.to_s.to_ber
        ].to_ber_sequence if paged_searches_supported
-      controls = controls.to_ber_contextspecific(0)
+      controls = controls.empty? ? nil : controls.to_ber_contextspecific(0)

-      pkt = [next_msgid.to_ber, request, controls].to_ber_sequence
+      pkt = [next_msgid.to_ber, request, controls].compact.to_ber_sequence
      @conn.write pkt

      result_code = 0