From 3bb3350ed9b34fb1ee94ad098f5b51ef1cc960d9 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sun, 31 Oct 2010 21:46:59 -0700 Subject: [PATCH] Fix bug parsing IPv6 addresses with ports --- inetd/module.info | 23 +---------------------- sshd/edit_net.cgi | 8 ++++++-- sshd/save_net.cgi | 3 ++- xinetd/module.info | 19 +------------------ xinetd/save_serv.cgi | 3 ++- 5 files changed, 12 insertions(+), 44 deletions(-) diff --git a/inetd/module.info b/inetd/module.info index 58efba2e1..4dd2a134a 100644 --- a/inetd/module.info +++ b/inetd/module.info @@ -1,26 +1,5 @@ -desc_ko_KR.euc=인트넷 서비스 및 프로토콜 risk=low medium high -desc_ru_SU=纘弄�螳 � 眺鞫駒驅� Internet -desc_zh_TW.Big5=빌쁘빌몰찥걷팒⑬쯹 -desc_pl=Us퀅gi i protoko퀉 internetowe -desc_de=Internet-Dienste und -Protokolle (inetd) -name=Inetd Admin -desc_zh_CN=inetd 륩蛟토零 -desc_pt=Servi�os e Protocolos de Internet category=net -desc_tr=Internet Servisleri ve Protokoller os_support=solaris *-linux hpux freebsd unixware openserver osf1 macos openbsd netbsd irix -desc=Internet Services and Protocols -desc_es=Servicios y Protocolos de Internet -desc_sv=Internettj�nster och -protokoll -desc_fr=Services et Protocoles Internet -desc_hu=Internet szolg�ltat�sok �s protokollok -desc_ru_RU=珞躁尿� � 厥剪適鏑� Internet -desc_ca=Protocols i Serveis d'Internet -desc_cz=Internetov� slu푕y a protokoly +desc=Network Services and Protocols longdesc=Edit services in /etc/inetd.conf, /etc/services and /etc/rpc. -desc_zh_TW.UTF-8=泳꿴슋泳꿱러�쐨�떃�늾�뜑若� -desc_zh_CN.UTF-8=inetd �쐨�뒦�뀓營� -desc_ko_KR.UTF-8=�씤�듃�꽬 �꽌鍮꾩뒪 諛� �봽濡쒗넗肄� -desc_nl=Internet Services en Protocollen -desc_ru.UTF-8=鬼筠��勻龜�곎� 龜 �읪�棘�궿압분압뿌� Internet diff --git a/sshd/edit_net.cgi b/sshd/edit_net.cgi index ed06d4a3b..caae94499 100755 --- a/sshd/edit_net.cgi +++ b/sshd/edit_net.cgi @@ -15,8 +15,12 @@ if ($version{'type'} eq 'openssh' && $version{'number'} >= 3) { $i = 0; @table = ( ); foreach $l (@listens, { }) { - local ($a, $p) = $l->{'values'}->[0] =~ /^(.*):(\d+)$/ ? - ($1, $2) : ($l->{'values'}->[0]); + local ($a, $p) = $l->{'values'}->[0] =~ /^([^:]*):(\d+)$/ || + $l->{'values'}->[0] =~ /^\[(.*)\]:(\d+)$/ ? + ($1, $2) : + $l->{'values'}->[0] =~ /^\[(.*)\]$/ ? + ($1) : + ($l->{'values'}->[0]); $amode = $a eq "::" ? 2 : $a eq "0.0.0.0" ? 1 : $a eq "" ? 0 : 3; push(@table, [ diff --git a/sshd/save_net.cgi b/sshd/save_net.cgi index f3a623ecd..b766223a9 100755 --- a/sshd/save_net.cgi +++ b/sshd/save_net.cgi @@ -20,12 +20,13 @@ if ($version{'type'} eq 'openssh' && $version{'number'} >= 3) { $a = "0.0.0.0"; } elsif ($in{"mode_$i"} == 2) { - $a = "::"; + $a = "[::]"; } elsif ($in{"mode_$i"} == 3) { $a = $in{"address_$i"}; &check_ipaddress($a) || &check_ip6address($a) || &error(&text('net_eladdress', $a)); + $a = "[$a]" if (&check_ip6address($a)); } if ($in{"port_${i}_def"}) { push(@listens, $a); diff --git a/xinetd/module.info b/xinetd/module.info index 6dd3f3500..6c8fd0a39 100644 --- a/xinetd/module.info +++ b/xinetd/module.info @@ -1,22 +1,5 @@ category=net -desc_ko_KR.euc=확장 인터넷 서비스 risk=low medium high -desc_pl=Rozszerzone us퀅gi internetowe (XInetd) -desc=Extended Internet Services -desc_es=Servicios Extendidos de Internet (XInetd) -desc_sv=Utökade Internettjänster (XInetd) +desc=Network Services name=Xinetd -desc_ja_JP.euc=냠칠ⅳτ�에샵磎책� Ⅵ【ΤⅩ -desc_zh_CN=Xinetd 륩蛟토零 (XInetd) -desc_ca=Serveis d'Internet Ampliats (XInetd) -desc_zh_TW.Big5=Xinetd㈄�逼天倜浿A씁 (XInetd) -desc_de=Erweiterte Internetdienste (xinetd) longdesc=Edit servers handled by Xinetd, a replacement for inetd. -desc_ms=Servis Internet Lanjutan (XInetd) -desc_sk=Roz뱁ren� internetov� slu푕y (XInetd) -desc_fr=Services Internet étendus (XInetd) -desc_tr=Geni�letilmi� �nternet Servisleri -desc_zh_TW.UTF-8=Xinetd兩뜸섯泳꿱러鴉뷸쐨�솳 (XInetd) -desc_zh_CN.UTF-8=Xinetd �쐨�뒦�뀓營� (XInetd) -desc_ja_JP.UTF-8=�떋凉듐궎�꺍�궭�꺖�깓�긿�깉 �궢�꺖�깛�궧 -desc_ko_KR.UTF-8=�솗�옣 �씤�꽣�꽬 �꽌鍮꾩뒪 diff --git a/xinetd/save_serv.cgi b/xinetd/save_serv.cgi index 4154ceaa3..065a7b018 100755 --- a/xinetd/save_serv.cgi +++ b/xinetd/save_serv.cgi @@ -96,7 +96,8 @@ else { &set_member_value($xinet, 'redirect'); } else { - gethostbyname($in{'rhost'}) || &error($text{'serv_erhost'}); + &to_ipaddress($in{'rhost'}) || &to_ip6address($in{'rhost'}) || + &error($text{'serv_erhost'}); $in{'rport'} =~ /^\d+$/ || &error($text{'serv_erport'}); @type = grep { $_ ne 'INTERNAL' } @type; &set_member_value($xinet, 'server');