mahlon/shelldap
1
0
Fork 0
Code Issues Pull requests Activity

Make password extension usage consistent with pager control.

Browse source 
FossilOrigin-Name: 35ab0ba86667a1dee396ab98e1c16a3e19d810d3db80cee58bbe8c1c965208f7
This commit is contained in:
Mahlon E. Smith 2017-06-07 21:48:42 +00:00
parent 2a068606e6
commit 32202df1ab
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shelldap
View file

@ -461,6 +461,7 @@ use Net::LDAP qw/
LDAP_OTHER LDAP_OTHER
LDAP_TIMEOUT LDAP_TIMEOUT
LDAP_NO_MEMORY LDAP_NO_MEMORY
LDAP_EXTENSION_PASSWORD_MODIFY
LDAP_CONNECT_ERROR LDAP_CONNECT_ERROR
LDAP_CONTROL_PAGED /; LDAP_CONTROL_PAGED /;
use Net::LDAP::Util qw/ canonical_dn ldap_explode_dn /; use Net::LDAP::Util qw/ canonical_dn ldap_explode_dn /;
@ -473,6 +474,7 @@ use Algorithm::Diff;
use Carp 'confess'; use Carp 'confess';
use base 'Term::Shell'; use base 'Term::Shell';
my $conf = $main::conf; my $conf = $main::conf;
# make 'die' backtrace in debug mode # make 'die' backtrace in debug mode
@ -526,8 +528,9 @@ sub init
# check for the pagination extension on the server early, and bail # check for the pagination extension on the server early, and bail
# if necessary. # if necessary.
if ( $conf->{'paginate'} && $conf->{'paginate'} =~ /^\d+$/ && $conf->{'paginate'} > 0 ) { if ( $conf->{'paginate'} && $conf->{'paginate'} =~ /^\d+$/ && $conf->{'paginate'} > 0 ) {
my $has_pagination = ( grep $_ eq LDAP_CONTROL_PAGED, $self->{'root_dse'}->get_value('supportedControl') ); unless ( $self->{'root_dse'}->supported_control(LDAP_CONTROL_PAGED) ) {
die "Server pagination is enabled, but the server doesn't seem to support it.\n" unless $has_pagination; die "Server pagination is enabled, but the server doesn't seem to support it.\n";
}
} }
else { else {
$conf->{'paginate'} = undef; $conf->{'paginate'} = undef;
@ -2171,8 +2174,7 @@ sub run_passwd
$self->{'root_dse'} ||= $self->ldap->root_dse(); $self->{'root_dse'} ||= $self->ldap->root_dse();
my $pw_extension = '1.3.6.1.4.1.4203.1.11.1'; unless ( $self->{'root_dse'}->supported_extension(LDAP_EXTENSION_PASSWORD_MODIFY) ) {
unless ( $self->{'root_dse'}->supported_extension( $pw_extension ) ) {
print "Sorry, password changes not supported by LDAP server.\n"; print "Sorry, password changes not supported by LDAP server.\n";
return; return;
} }