maff
/
scripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a weird bug where use of binary operators over unary would result in unexpected behaviour

This commit is contained in:
Maff 2014-02-08 20:15:47 +00:00
parent 03a9b3415e
commit c78f17925d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rdns-manager
View File

@ -41,7 +41,7 @@ sub validate_domain {
}
sub validate_ip {
my $ip = shift;
return 1 if is_public_ipv4($ip) || is_public_ipv6($ip);
return 1 if is_public_ipv4 $ip or is_public_ipv6 $ip;
return 0;
}
sub get_arpa {
@ -64,7 +64,7 @@ sub does_fqdn_match {
return 0 unless defined $p;
my @res = $p->answer;
#due to IPv6 shortening, we need to use Net::IP here
return 1 unless scalar @res < 1 || Net::IP->new($res[0]->address)->ip ne Net::IP->new($ip)->ip;
return 1 unless scalar @res < 1 or Net::IP->new($res[0]->address)->ip ne Net::IP->new($ip)->ip;
return 0;
}
sub confirm_rdns {
@ -75,7 +75,7 @@ sub confirm_rdns {
my $p = $r->search($rrec, 'PTR');
return 0 unless defined $p;
my @res = $p->answer;
return 1 unless scalar @res < 1 || $res[0]->ptrdname."." ne $fqdn;
return 1 unless scalar @res < 1 or $res[0]->ptrdname."." ne $fqdn;
return 0;
}
sub get_rdns {
@ -113,8 +113,8 @@ GetOptions
my $ip = shift or nicedie "No IP given!";
$prefixlen = $1 if $ip =~ s/\/([0-9]+)//; #split off prefixlen (if given) into variable for later use
nicedie "Invalid IP address '$ip'!" unless validate_ip $ip;
my $domain = shift or nicedie "No FQDN given!" unless $fsync || $reset || $delptr; #conditionally allow the user to not specify a fqdn
nicedie "Invalid FQDN '$domain'!" if defined $domain && !validate_domain $domain;
my $domain = shift or nicedie "No FQDN given!" unless $fsync or $reset or $delptr; #conditionally allow the user to not specify a fqdn
nicedie "Invalid FQDN '$domain'!" if defined $domain and !validate_domain $domain;
$domain =~ s/([a-zA-Z])$/$1./; #Append final period if it doesn't exist
#main flow