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

run_cat: convert to using path_to_dn()

Browse source 
run_edit: convert to using path_to_dn()
run_copy & run_move: convert to using path_to_dn()
run_grep: convert to using path_to_dn()
run_passwd: convert to using path_to_dn()

FossilOrigin-Name: fc6d77c7619cabcd8f79bc3f7e41fd2627e246ee011858eb23af9d5dfe827970
This commit is contained in:
peter@adpm.de 2011-03-06 19:31:05 +00:00
parent 7fb1878c47
commit 886a1c9855
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
shelldap
View file

@ -1005,7 +1005,8 @@ sub run_cat
}); });
} }
else { else {
$self->rdn_to_dn( \$dn ); # convert given path to DN
$dn = $self->path_to_dn($dn, relative => 1);
$s = $self->search({ $s = $self->search({
base => $dn, base => $dn,
vals => 1, vals => 1,
@ -1086,8 +1087,9 @@ sub run_copy
return; return;
} }
my $s_rdn = $s_dn; # convert given source path to DN
$self->rdn_to_dn( \$s_dn ); $s_dn = $self->path_to_dn($s_dn, relative => 1);
my $s = $self->search({ base => $s_dn, vals => 1 }); my $s = $self->search({ base => $s_dn, vals => 1 });
unless ( $s->{'code'} == LDAP_SUCCESS ) { unless ( $s->{'code'} == LDAP_SUCCESS ) {
print "No such object\n"; print "No such object\n";
@ -1254,10 +1256,9 @@ sub run_edit
return; return;
} }
# support '.' # convert given path to DN
$dn = $self->base() if $dn eq '.'; $dn = $self->path_to_dn($dn, relative => 1);
$self->rdn_to_dn( \$dn );
my $s = $self->search({ base => $dn, vals => 1 }); my $s = $self->search({ base => $dn, vals => 1 });
if ( $s->{'code'} ) { if ( $s->{'code'} ) {
@ -1418,7 +1419,8 @@ sub run_grep
print "No search base specified.\n"; print "No search base specified.\n";
return; return;
} }
$self->rdn_to_dn( \$base ); # convert base path to DN
$base = $self->path_to_dn($base, relative => 1);
$self->debug("Filter parsed as: " . $filter->as_string() . "\n"); $self->debug("Filter parsed as: " . $filter->as_string() . "\n");
@ -1643,8 +1645,9 @@ sub run_move
return; return;
} }
my $s_rdn = $s_dn; # convert given source path to DN
$self->rdn_to_dn( \$s_dn ); $s_dn = $self->path_to_dn($s_dn, relative => 1);
unless ( $self->is_valid_dn( $s_dn ) ) { unless ( $self->is_valid_dn( $s_dn ) ) {
print "No such object\n"; print "No such object\n";
return; return;
@ -1683,10 +1686,9 @@ sub run_passwd
return; return;
} }
# support '.' # convert given path to DN
$dn = $self->base() if $dn eq '.'; $self->path_to_dn($dn, relative => 1);
$self->rdn_to_dn( \$dn );
my $s = $self->search( { base => $dn, scope => 'base' } ); my $s = $self->search( { base => $dn, scope => 'base' } );
if ( $s->{'code'} ) { if ( $s->{'code'} ) {
print $s->{'message'}, "\n"; print $s->{'message'}, "\n";