projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix deletions on pc92 config (finally)?
[spider.git]
/
perl
/
DXProtHandle.pm
diff --git
a/perl/DXProtHandle.pm
b/perl/DXProtHandle.pm
index 51f40463ed3a582bd3260e0677109ee2cb2480e5..f04c6958f3f658e07a7ba9b367b09c72ef2f01b9 100644
(file)
--- a/
perl/DXProtHandle.pm
+++ b/
perl/DXProtHandle.pm
@@
-1399,7
+1399,7
@@
sub _del_thingy
if ($is_node) {
my $nref = Route::Node::get($call);
@rout = $nref->del($parent) if $nref;
if ($is_node) {
my $nref = Route::Node::get($call);
@rout = $nref->del($parent) if $nref;
- dbg("ROUTE: delet
ed
node $call from " . $parent->call) if isdbg('route');
+ dbg("ROUTE: delet
ing
node $call from " . $parent->call) if isdbg('route');
} else {
my $uref = Route::User::get($call);
@rout = $parent->del_user($uref) if $uref;
} else {
my $uref = Route::User::get($call);
@rout = $parent->del_user($uref) if $uref;
@@
-1563,13
+1563,20
@@
sub handle_92
my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users);
my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users);
+ # add users here
foreach my $r (@nent) {
my $call = $r->[0];
if ($call) {
push @radd,_add_thingy($parent, $r) if grep $call eq $_, (@$nnodes, @$nusers);
foreach my $r (@nent) {
my $call = $r->[0];
if ($call) {
push @radd,_add_thingy($parent, $r) if grep $call eq $_, (@$nnodes, @$nusers);
- push @rdel,_del_thingy($parent, $r) if grep $call eq $_, (@$dnodes, @$dusers);
}
}
}
}
+ # del users here
+ foreach my $r (@$dnodes) {
+ push @rdel,_del_thingy($parent, [$r, 1]);
+ }
+ foreach my $r (@$dusers) {
+ push @rdel,_del_thingy($parent, [$r, 0]);
+ }
} else {
dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr');
return;
} else {
dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr');
return;