X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fset%2Fbadip.pl;h=bfbd89ce505900423736986a449b4d568ff02ce0;hb=6a17c3a3e2f7a72c0d13a93c90a010b753319def;hp=b33261b7faa473233bda582d38f5e890710afdc7;hpb=cbbf83baa54e859c382de79954607923cbb1b653;p=spider.git

diff --git a/cmd/set/badip.pl b/cmd/set/badip.pl
index b33261b7..bfbd89ce 100644
--- a/cmd/set/badip.pl
+++ b/cmd/set/badip.pl
@@ -9,6 +9,8 @@ my ($self, $line) = @_;
 return (1, $self->msg('e5')) if $self->remotecmd;
 # are we permitted?
 return (1, $self->msg('e5')) if $self->priv < 6;
+return (1, q{Please install Net::CIDR::Lite or libnet-cidr-lite-perl to use this command}) unless $DXCIDR::active;
+
 my @out;
 my @added;
 my @in = split /\s+/, $line;
@@ -19,6 +21,10 @@ if ($in[0] =~ /^[_\d\w]+$/) {
 return (1, "set/badip: need [suffix (def: local])] IP, IP-IP or IP/24") unless @in;
 for my $ip (@in) {
 	my $r;
+	unless (is_ipaddr($ip)) {
+		push @out, "set/badip: '$ip' is not an ip address, ignored";
+		next;
+	}
 	eval{ $r = DXCIDR::find($ip); };
 	return (1, "set/badip: $ip $@") if $@;
 	if ($r) {
@@ -32,6 +38,10 @@ my $count = @added;
 my $list = join ' ', @in;
 DXCIDR::clean_prep();
 #$DB::single = 1;
-DXCIDR::append($suffix, @added);
-push @out, "set/badip: added $count entries to badip.$suffix : $list" if $count;
+if ($count) {
+	DXCIDR::append($suffix, @added);
+	push @out, "set/badip: added $count entries to badip.$suffix : '$list'";
+} else {
+	push @out, "set/badip: No valid IPs, not updating badip.$suffix with '$list'";
+}
 return (1, @out);