From: minima <minima>
Date: Thu, 28 Jun 2001 14:23:44 +0000 (+0000)
Subject: fix problems with users on more than one node
X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=d08aaa3e89259031f2d9b70a83ae194620870e7f;p=spider.git

fix problems with users on more than one node
---

diff --git a/Changes b/Changes
index 4c528768..734bbdfc 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+28Jun01=======================================================================
+1. fix problems with users on more than one node
 27Jun01=======================================================================
 1. try adding an ARC mail hack
 2. slug the not here messages so they can't loopback
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index fb6ba02a..460e401a 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -559,10 +559,13 @@ sub normal
 				my $r = Route::User::get($call);
 				my $flags = Route::here($here)|Route::conf($conf);
 				
-				if ($r && $r->flags != $flags) {
-					$r->flags($flags);
-					push @rout, $r;
-				} elsif (!$r) {
+				if ($r) {
+					if ($r->flags != $flags) {
+						$r->flags($flags);
+						push @rout, $r;
+					}
+					$r->addparent($ncall);
+				} else {
 					push @rout, $parent->add_user($call, $flags);
 				}
 				
diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index 51ecedea..e29fe3ca 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -135,7 +135,12 @@ sub add_user
 
 	$self->{usercount} = scalar @{$self->{users}};
 	my $uref = Route::User::get($ucall);
-	my @out = (Route::User->new($ucall, $self->{call}, @_)) unless $uref;
+	my @out;
+	if ($uref) {
+		$uref->addparent($self->{call});
+	} else {
+		@out = Route::User->new($ucall, $self->{call}, @_);
+	}
 	return @out;
 }