From c11ec4425857f845e66da1dc2ab2bc2a5fae9806 Mon Sep 17 00:00:00 2001 From: Daniel Abrahamsson Date: Thu, 25 Aug 2011 13:14:10 +0200 Subject: [PATCH 1/2] Bugfix: rename failed because of unqualified constants --- lib/net/ldap.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb index b0105fc..0f1fe65 100644 --- a/lib/net/ldap.rb +++ b/lib/net/ldap.rb @@ -1529,7 +1529,9 @@ class Net::LDAP::Connection #:nodoc: pkt = [next_msgid.to_ber, request.to_ber_appsequence(12)].to_ber_sequence @conn.write pkt - (be = @conn.read_ber(AsnSyntax)) && (pdu = LdapPdu.new( be )) && (pdu.app_tag == 13) or raise LdapError.new( "response missing or invalid" ) + (be = @conn.read_ber(Net::LDAP::AsnSyntax)) && + (pdu = Net::LDAP::PDU.new( be )) && (pdu.app_tag == 13) or + raise Net::LDAP::LdapError.new( "response missing or invalid" ) pdu.result_code end From c90821a7bdd1862e007e2c58cc159ecb5fee4c67 Mon Sep 17 00:00:00 2001 From: Daniel Abrahamsson Date: Thu, 25 Aug 2011 13:16:45 +0200 Subject: [PATCH 2/2] Fixed whitespace issues in lib/net/ldap.rb --- lib/net/ldap.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb index 0f1fe65..ae63ce5 100644 --- a/lib/net/ldap.rb +++ b/lib/net/ldap.rb @@ -1320,7 +1320,7 @@ class Net::LDAP::Connection #:nodoc: # in the protocol. #++ def search(args = {}) - search_filter = (args && args[:filter]) || + search_filter = (args && args[:filter]) || Net::LDAP::Filter.eq("objectclass", "*") search_filter = Net::LDAP::Filter.construct(search_filter) if search_filter.is_a?(String) search_base = (args && args[:base]) || "dc=example, dc=com" @@ -1521,11 +1521,11 @@ class Net::LDAP::Connection #:nodoc: old_dn = args[:olddn] or raise "Unable to rename empty DN" new_rdn = args[:newrdn] or raise "Unable to rename to empty RDN" delete_attrs = args[:delete_attributes] ? true : false - new_superior = args[:new_superior] + new_superior = args[:new_superior] + + request = [old_dn.to_ber, new_rdn.to_ber, delete_attrs.to_ber] + request << new_superior.to_ber unless new_superior == nil - request = [old_dn.to_ber, new_rdn.to_ber, delete_attrs.to_ber] - request << new_superior.to_ber unless new_superior == nil - pkt = [next_msgid.to_ber, request.to_ber_appsequence(12)].to_ber_sequence @conn.write pkt