X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=90506ed4df9ee6c44ea80e115fe0abef9b6c38bc;hb=4b1dd2cb842a8e7df9b1b3e9a8e166e333dfec0a;hp=65ad93f930a1bcb164ea623c1fe4f15be8ed19a1;hpb=8cd5395c7fe3c5a791af797fe03b9d7d32ae12d5;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 65ad93f9..90506ed4 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -221,11 +221,15 @@ sub normal
 				return;
 			}
 
-			# are any of the crucial fields invalid?
-            if ($field[2] =~ /(?:^\s*$|[a-z])/ || $field[6] =~ /(?:^\s*$|[a-z])/ || $field[7] =~ /(?:^\s*$|[a-z])/) {
+			# are any of the callsign fields invalid?
+            if ($field[2] =~ m/[^A-Z0-9\-\/]/ || $field[6] =~ m/[^A-Z0-9\-]/ || $field[7] =~ m/[^A-Z0-9\-]/) {
 				dbg('chan', "Spot contains lower case callsigns or blanks, rejected");
 				return;
 			}
+            if ($field[1] =~ m/[^0-9\.]/) {
+				dbg('chan', "Spot frequency not numeric, rejected");
+				return;
+			}
 			
 			# do some de-duping
 			$field[5] =~ s/^\s+//;      # take any leading blanks off
@@ -619,7 +623,7 @@ sub normal
 				my $ref = DXUser->get_current($field[2]);
 				my $cref = DXCluster->get($field[2]);
 				Log('rcmd', 'in', $ref->{priv}, $field[2], $field[3]);
-				unless ($field[3] =~ /rcmd/i || !$cref || !$ref || $cref->mynode->call ne $ref->homenode) {    # not allowed to relay RCMDS!
+				unless (!$cref || !$ref || $cref->mynode->call ne $ref->homenode) {    # not allowed to relay RCMDS!
 					if ($ref->{priv}) {	# you have to have SOME privilege, the commands have further filtering
 						$self->{remotecmd} = 1; # for the benefit of any command that needs to know
 						my $oldpriv = $self->{priv};