@@ -1320,7 +1320,7 @@ def bind_gss_spnego(auth)
13201320 # in the protocol.
13211321 #++
13221322 def search ( args = { } )
1323- search_filter = ( args && args [ :filter ] ) ||
1323+ search_filter = ( args && args [ :filter ] ) ||
13241324 Net ::LDAP ::Filter . eq ( "objectclass" , "*" )
13251325 search_filter = Net ::LDAP ::Filter . construct ( search_filter ) if search_filter . is_a? ( String )
13261326 search_base = ( args && args [ :base ] ) || "dc=example, dc=com"
@@ -1521,15 +1521,17 @@ def rename args
15211521 old_dn = args [ :olddn ] or raise "Unable to rename empty DN"
15221522 new_rdn = args [ :newrdn ] or raise "Unable to rename to empty RDN"
15231523 delete_attrs = args [ :delete_attributes ] ? true : false
1524- new_superior = args [ :new_superior ]
1524+ new_superior = args [ :new_superior ]
1525+
1526+ request = [ old_dn . to_ber , new_rdn . to_ber , delete_attrs . to_ber ]
1527+ request << new_superior . to_ber unless new_superior == nil
15251528
1526- request = [ old_dn . to_ber , new_rdn . to_ber , delete_attrs . to_ber ]
1527- request << new_superior . to_ber unless new_superior == nil
1528-
15291529 pkt = [ next_msgid . to_ber , request . to_ber_appsequence ( 12 ) ] . to_ber_sequence
15301530 @conn . write pkt
15311531
1532- ( be = @conn . read_ber ( AsnSyntax ) ) && ( pdu = LdapPdu . new ( be ) ) && ( pdu . app_tag == 13 ) or raise LdapError . new ( "response missing or invalid" )
1532+ ( be = @conn . read_ber ( Net ::LDAP ::AsnSyntax ) ) &&
1533+ ( pdu = Net ::LDAP ::PDU . new ( be ) ) && ( pdu . app_tag == 13 ) or
1534+ raise Net ::LDAP ::LdapError . new ( "response missing or invalid" )
15331535 pdu . result_code
15341536 end
15351537
0 commit comments