use symbolic LDAP error codes instead of numbers

FossilOrigin-Name: bc0bc274f9ed971e174416c49242eb2c6f5a29dd5a0ec77d434b28e231e1502c
This commit is contained in:
peter@adpm.de 2011-03-05 16:33:41 +00:00
parent 778926d3c5
commit 854df89671

View file

@ -364,7 +364,7 @@ use warnings;
use Term::ReadKey; use Term::ReadKey;
use Term::Shell; use Term::Shell;
use Digest::MD5; use Digest::MD5;
use Net::LDAP; use Net::LDAP qw(LDAP_SUCCESS LDAP_SERVER_DOWN);
use Net::LDAP::LDIF; use Net::LDAP::LDIF;
use Data::Dumper; use Data::Dumper;
use File::Temp; use File::Temp;
@ -661,7 +661,7 @@ sub is_valid_dn
my $r = $self->search({ base => $dn }); my $r = $self->search({ base => $dn });
return $r->{'code'} == 0 ? 1 : 0; return $r->{'code'} == LDAP_SUCCESS ? 1 : 0;
} }
# perform an ldap search # perform an ldap search
@ -698,7 +698,7 @@ sub search
# check for a lost connection, kill cached object so we # check for a lost connection, kill cached object so we
# try to reconnect on the next search. # try to reconnect on the next search.
# #
$self->{'ldap'} = undef if $s->code() == 81; $self->{'ldap'} = undef if $s->code() == LDAP_SERVER_DOWN;
$rv->{'entries'} = $rv->{'entries'} =
$opts->{'scope'} eq 'base' ? [ $s->shift_entry() ] : [ $s->entries() ]; $opts->{'scope'} eq 'base' ? [ $s->shift_entry() ] : [ $s->entries() ];
@ -1046,7 +1046,7 @@ sub run_copy
my $s_rdn = $s_dn; my $s_rdn = $s_dn;
$self->rdn_to_dn( \$s_dn ); $self->rdn_to_dn( \$s_dn );
my $s = $self->search({ base => $s_dn, vals => 1 }); my $s = $self->search({ base => $s_dn, vals => 1 });
unless ( $s->{'code'} == 0 ) { unless ( $s->{'code'} == LDAP_SUCCESS ) {
print "No such object\n"; print "No such object\n";
return; return;
} }
@ -1632,7 +1632,7 @@ sub run_passwd
newpasswd => $pw newpasswd => $pw
); );
if ( $rv->code() == 0 ) { if ( $rv->code() == LDAP_SUCCESS ) {
print "Password updated successfully.\n"; print "Password updated successfully.\n";
} else { } else {
print "Password error: " . $rv->error() . "\n"; print "Password error: " . $rv->error() . "\n";