X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=059a24a929997f5ca5c8cb150490803d823b605d;hb=5167e718e090d2869a02cdba98760c069a8948c3;hp=bc57440f3dc31f5ce95a8f38d41ac565b8cdfae8;hpb=85bdc933dd042496fb40f3886ca80e2b04cfb1b6;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index bc57440f..059a24a9 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -175,7 +175,7 @@ sub new_channel
 			return;
 		}
 		if ($bumpexisting) {
-			my $ip = $conn->{peerhost} || 'unknown';
+			my $ip = $conn->peerhost || 'unknown';
 			$dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
 			LogDbg('DXCommand', "$call bumped off by $ip, disconnected");
 			$dxchan->disconnect;
@@ -187,7 +187,7 @@ sub new_channel
 
 	# (fairly) politely disconnect people that are connected to too many other places at once
 	my $r = Route::get($call);
-	if ($conn->{sort} =~ /^I/ && $r && $user) {
+	if ($conn->{sort} && $conn->{sort} =~ /^I/ && $r && $user) {
 		my @n = $r->parents;
 		my $m = $r->isa('Route::Node') ? $maxconnect_node : $maxconnect_user;
 		my $c = $user->maxconnect;
@@ -208,7 +208,7 @@ sub new_channel
 	my $lock = $user->lockout if $user;
 	if ($baseuser && $baseuser->lockout || $lock) {
 		if (!$user || !defined $lock || $lock) {
-			my $host = $conn->{peerhost} || "unknown";
+			my $host = $conn->peerhost || "unknown";
 			LogDbg('DXCommand', "$call on $host is locked out, disconnected");
 			$conn->disconnect;
 			return;
@@ -405,6 +405,7 @@ DXUser->init($userfn, 1);
 
 # look for the sysop and the alias user and complain if they aren't there
 {
+	die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
 	my $ref = DXUser::get($mycall);
 	die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
 	$ref = DXUser::get($myalias);