Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changes for the next release #6

Merged
merged 10 commits into from Apr 6, 2012
2 changes: 1 addition & 1 deletion lib/Net/LDAP.pm
Expand Up @@ -845,7 +845,7 @@ sub process {
my $sel = IO::Select->new($sock);
my $ready;

for( $ready = 1 ; $ready ; $ready = $sel->can_read(0)) {
for( $ready = 1 ; $ready ; $ready = $sel->can_read(0) || (ref($sock) eq 'IO::Socket::SSL' && $sock->pending())) {
my $pdu;
asn_read($sock, $pdu)
or return _drop_conn($ldap, LDAP_OPERATIONS_ERROR, "Communications Error");
Expand Down
4 changes: 2 additions & 2 deletions lib/Net/LDAP/Constant.pm
Expand Up @@ -404,15 +404,15 @@ Operation was canceled

=item LDAP_NO_SUCH_OPERATION (119)

Server has no knowledge of the operation requested for cancelation
Server has no knowledge of the operation requested for cancellation

=item LDAP_TOO_LATE (120)

Too late to cancel the outstanding operation

=item LDAP_CANNOT_CANCEL (121)

The identified operation does not support cancelation or
The identified operation does not support cancellation or
the cancel operation cannot be performed

=item LDAP_ASSERTION_FAILED (122)
Expand Down
2 changes: 1 addition & 1 deletion lib/Net/LDAP/Control/MatchedValues.pm
Expand Up @@ -83,7 +83,7 @@ by RFC 3876.

The C<MatchedValues Control>, which only has a meaning with the C<Search> operation,
allows the client to specify criteria that restrict the values of attributes returned.
It has no effect on the number of objects found, but only allows to restrict the
It has no effect on the number of objects found, but only allows one to restrict the
values of the attributes returned by the search to those matching the criteria.


Expand Down
2 changes: 1 addition & 1 deletion lib/Net/LDAP/Control/PostRead.pm
Expand Up @@ -54,7 +54,7 @@ by RFC 4527.
In modification operations, the C<Post-Read request control> indicates to the
server that a copy of the modified entry after the update is to be returned.
After the successful completion of the operation, the accompanying C<Post-Read
response control> allows to retrieve the updated value from the servers's response.
response control> allows one to retrieve the updated value from the servers's response.

One use case of this control may be to obtain values of operational attributes,
such as the C<entryUUID> and C<modifyTimestamp> attributes, updated by the server
Expand Down
2 changes: 1 addition & 1 deletion lib/Net/LDAP/Control/PreRead.pm
Expand Up @@ -108,7 +108,7 @@ by RFC 4527.
In modification operations, the C<Pre-Read request control> indicates to the
server that a copy of the original entry before the update is to be returned.
After the successful completion of the operation, the accompanying C<Pre-Read
response control> allows to retrieve the original value from the servers's response.
response control> allows one to retrieve the original value from the servers's response.

One use case of this control control may be to obtain replaced or deleted
values of modified attributes or a copy of the entry being deleted.
Expand Down
1 change: 1 addition & 0 deletions lib/Net/LDAP/Entry.pm
Expand Up @@ -289,6 +289,7 @@ sub update {
}
}
elsif (ref($target) && UNIVERSAL::isa($target, 'Net::LDAP::LDIF')) {
require Net::LDAP::Message;
$target->write_entry($self);
$mesg = Net::LDAP::Message::Dummy->new();
$mesg->set_error(LDAP_OTHER, $target->error())
Expand Down