From 7611df68a1692292fc27fde0e744a64e753fa41c Mon Sep 17 00:00:00 2001 From: thecorkscrew Date: Mon, 10 Dec 2018 13:22:34 +0100 Subject: [PATCH 1/2] Resetting parent of hosts Reset the parent variable when reading the host list. Like this, hosts that are in no subnet will not "inherit" the last known subnet. --- dhcpd/index.cgi | 1 + 1 file changed, 1 insertion(+) diff --git a/dhcpd/index.cgi b/dhcpd/index.cgi index ea86551ab..e2139ac03 100755 --- a/dhcpd/index.cgi +++ b/dhcpd/index.cgi @@ -595,6 +595,7 @@ print &ui_columns_start([ "", $text{'index_hostgroup'}, for ($i = $_[1]; $i < $_[2]; $i++) { local @cols; local $firstcol; + $parent = ""; $h = $_[0]->[$i]; if ($h->{'name'} eq 'host') { $firstcol .= $sp; From 61b0cafcb5bada78636696f21472588fbb5f603f Mon Sep 17 00:00:00 2001 From: Daniel Bremer <5bremer@informatk.uni-hamburg.de> Date: Mon, 10 Dec 2018 17:52:11 +0100 Subject: [PATCH 2/2] Change some lang files to allow empty subnets --- dhcpd/index.cgi | 5 +++-- dhcpd/lang/ca | 6 +++--- dhcpd/lang/cz | 6 +++--- dhcpd/lang/da | 0 dhcpd/lang/de | 6 +++--- dhcpd/lang/en | 6 +++--- dhcpd/lang/es | 6 +++--- dhcpd/lang/fa | 6 +++--- dhcpd/lang/fr | 6 +++--- dhcpd/lang/ja_JP.euc | 6 +++--- dhcpd/lang/ja_JP.jis | 6 +++--- dhcpd/lang/ko_KR.euc | 6 +++--- dhcpd/lang/nl | 6 +++--- dhcpd/lang/no | 6 +++--- dhcpd/lang/pl | 6 +++--- dhcpd/lang/pt | 0 dhcpd/lang/pt_BR | 6 +++--- dhcpd/lang/ru_RU | 6 +++--- dhcpd/lang/ru_SU | 6 +++--- dhcpd/lang/sk | 6 +++--- dhcpd/lang/sv | 6 +++--- dhcpd/lang/tr | 0 dhcpd/lang/uk_UA | 6 +++--- dhcpd/lang/zh_CN | 6 +++--- dhcpd/lang/zh_TW.Big5 | 6 +++--- 25 files changed, 66 insertions(+), 65 deletions(-) mode change 100644 => 100755 dhcpd/lang/ca mode change 100644 => 100755 dhcpd/lang/cz mode change 100644 => 100755 dhcpd/lang/da mode change 100644 => 100755 dhcpd/lang/de mode change 100644 => 100755 dhcpd/lang/en mode change 100644 => 100755 dhcpd/lang/es mode change 100644 => 100755 dhcpd/lang/fa mode change 100644 => 100755 dhcpd/lang/fr mode change 100644 => 100755 dhcpd/lang/ja_JP.euc mode change 100644 => 100755 dhcpd/lang/ja_JP.jis mode change 100644 => 100755 dhcpd/lang/ko_KR.euc mode change 100644 => 100755 dhcpd/lang/nl mode change 100644 => 100755 dhcpd/lang/no mode change 100644 => 100755 dhcpd/lang/pl mode change 100644 => 100755 dhcpd/lang/pt mode change 100644 => 100755 dhcpd/lang/pt_BR mode change 100644 => 100755 dhcpd/lang/ru_RU mode change 100644 => 100755 dhcpd/lang/ru_SU mode change 100644 => 100755 dhcpd/lang/sk mode change 100644 => 100755 dhcpd/lang/sv mode change 100644 => 100755 dhcpd/lang/tr mode change 100644 => 100755 dhcpd/lang/uk_UA mode change 100644 => 100755 dhcpd/lang/zh_CN mode change 100644 => 100755 dhcpd/lang/zh_TW.Big5 diff --git a/dhcpd/index.cgi b/dhcpd/index.cgi index e2139ac03..ca123718d 100755 --- a/dhcpd/index.cgi +++ b/dhcpd/index.cgi @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # $Id: index.cgi,v 1.6 2005/04/16 14:30:21 jfranken Exp $ # * List all subnets and shared networks # @@ -596,6 +596,7 @@ for ($i = $_[1]; $i < $_[2]; $i++) { local @cols; local $firstcol; $parent = ""; + $par_type = ""; $h = $_[0]->[$i]; if ($h->{'name'} eq 'host') { $firstcol .= $sp; @@ -626,7 +627,7 @@ for ($i = $_[1]; $i < $_[2]; $i++) { if ($config{'desc_name'} && $par{$h}->{'comment'}) { $parent = $par{$h}->{'comment'}; } - push(@cols, "$par_type: $parent"); + push(@cols, "$par_type $parent"); push(@cols, $_[3]->[$i] ? &hardware($h) : ""); push(@cols, $_[3]->[$i] ? &fixedaddr($h) : ""); print &ui_checked_columns_row(\@cols, \@tds, "d", $_[5]->[$i]); diff --git a/dhcpd/lang/ca b/dhcpd/lang/ca old mode 100644 new mode 100755 index 6d0ac079d..58339a199 --- a/dhcpd/lang/ca +++ b/dhcpd/lang/ca @@ -40,9 +40,9 @@ index_horder1=Estructura de fitxers index_horder2=Nom index_horder3=Adrea del maquinari index_horder4=Adrea IP -index_togroup=Grup -index_tosubnet=Subxarxa -index_toshared=Xarxa +index_togroup=Grup: +index_tosubnet=Subxarxa: +index_toshared=Xarxa: index_ndisplay=Mostra les xarxes i subxarxes per: index_norder0=Assignaci index_norder1=Estructura de fitxers diff --git a/dhcpd/lang/cz b/dhcpd/lang/cz old mode 100644 new mode 100755 index 2ecf4f394..38a63fedc --- a/dhcpd/lang/cz +++ b/dhcpd/lang/cz @@ -251,9 +251,9 @@ index_subtitle=Pods index_subtoomany=Moc podst pro zobrazen. index_text=Editace konfiguranho souboru v textovm editoru (POZOR!) index_title=DHCP Server -index_togroup=Skupina -index_toshared=S -index_tosubnet=Pods +index_togroup=Skupina: +index_toshared=S: +index_tosubnet=Pods: index_version=ISC DHCPd verze $1 index_zone=Zna keys_alg=Algoritmus diff --git a/dhcpd/lang/da b/dhcpd/lang/da old mode 100644 new mode 100755 diff --git a/dhcpd/lang/de b/dhcpd/lang/de old mode 100644 new mode 100755 index 6f3d6c522..7616064ba --- a/dhcpd/lang/de +++ b/dhcpd/lang/de @@ -257,9 +257,9 @@ index_subtitle=Subnetze und freigegebene Netzwerke index_subtoomany=Es gibt zu viele Subnetze zum anzeigen. index_text=Konfigurationsdatei im Texteditor manuell bearbeiten index_title=DHCP-Server -index_togroup=Gruppe -index_toshared=Netzwerk -index_tosubnet=Subnetz +index_togroup=Gruppe: +index_toshared=Netzwerk: +index_tosubnet=Subnetz: index_version=ISC DHCPd Version $1 index_zone=Zone keys_alg=Algorithmus diff --git a/dhcpd/lang/en b/dhcpd/lang/en old mode 100644 new mode 100755 index 973aeaf18..51a888995 --- a/dhcpd/lang/en +++ b/dhcpd/lang/en @@ -40,9 +40,9 @@ index_horder1=File structure index_horder2=Name index_horder3=Hardware address index_horder4=IP address -index_togroup=Group -index_tosubnet=Subnet -index_toshared=Network +index_togroup=Group: +index_tosubnet=Subnet: +index_toshared=Network: index_ndisplay=Display nets and subnets by: index_norder0=Assignment index_norder1=File structure diff --git a/dhcpd/lang/es b/dhcpd/lang/es old mode 100644 new mode 100755 index ce64eb248..7cb2125d2 --- a/dhcpd/lang/es +++ b/dhcpd/lang/es @@ -113,7 +113,7 @@ plib_chname=Nombre de máquina cliente secs=segs plib_swapserv=Servidores de intercambio plib_invaliddom=$1 no es un nombre válido de dominio -index_tosubnet=Subred +index_tosubnet=Subred: eacl_psn=seleccionar red compartida plib_dnsserv=Servidores DNS listl_active=activos @@ -188,7 +188,7 @@ esh_crheader=Crear Red Compartida esub_retshar=red compartida esub_nmask=Máscara de Red index_234memb=$1 miembros -index_toshared=Red +index_toshared=Red: plib_leformat=Fecha de fin de arrendamiento debe de estar en formato W YYYY/MM/DD HH:MM:SS plib_bfname=Nombre de archivo de Boot esub_tabhdr=Detalles de Subred @@ -203,7 +203,7 @@ esh_netname=Nombre de red eopt_ntpserv=Servidores NTP plib_invalidlt=no es un tiempo de arrendamiento válido plib_forever=Para siempre -index_togroup=Grupo +index_togroup=Grupo: acl_paranoic=paranoico index_ndisplay=Mostrar redes y subredes por: eopt_dnsserv=Servidores DNS diff --git a/dhcpd/lang/fa b/dhcpd/lang/fa old mode 100644 new mode 100755 index 5baff6167..8617b9681 --- a/dhcpd/lang/fa +++ b/dhcpd/lang/fa @@ -40,9 +40,9 @@ index_horder1=ساختار پرونده index_horder2=نام index_horder3=نشاني سخت‌افزاري index_horder4=نشاني IP -index_togroup=گروه -index_tosubnet=زير‌شبکه -index_toshared=شبکه +index_togroup=گروه: +index_tosubnet=زير‌شبکه: +index_toshared=شبکه: index_ndisplay=نمايش شبکه‌ها و زير‌شبکه‌ها توسط: index_norder0=انتساب index_norder1=ساختار پرونده diff --git a/dhcpd/lang/fr b/dhcpd/lang/fr old mode 100644 new mode 100755 index 73d6184d8..138e4ec15 --- a/dhcpd/lang/fr +++ b/dhcpd/lang/fr @@ -116,7 +116,7 @@ plib_chname=Nom de machine du client secs=secondes plib_swapserv=Serveur de mémoire temporaire plib_invaliddom=$1 n'est pas un nom de domaine valide -index_tosubnet=Sous-réseau +index_tosubnet=Sous-réseau: eacl_psn=selectionner le réseau partagé plib_dnsserv=Serveurs de nom de domaine listl_active=active @@ -195,7 +195,7 @@ esh_crheader=Créer un réseau partagé esub_retshar=réseau partagé esub_nmask=Masque de sous-réseau index_234memb=$1 membres -index_toshared=Réseau +index_toshared=Réseau: plib_leformat=La date de fin d'attribution doit être dans le format W AAAA/MM/JJ HH:MM:SS plib_bfname=Fichier de démarrage esub_tabhdr=Détails du sous-réseau @@ -210,7 +210,7 @@ esh_netname=Nom du réseau eopt_ntpserv=Serveurs NTP plib_invalidlt=n'est pas un temps d'attribution valide plib_forever=Infini -index_togroup=Groupe +index_togroup=Groupe: acl_paranoic=paranoïaque index_ndisplay=Afficher réseaux et sous-réseaux par : eopt_dnsserv=Serveurs de nom de domaine diff --git a/dhcpd/lang/ja_JP.euc b/dhcpd/lang/ja_JP.euc old mode 100644 new mode 100755 index 97364b3eb..dc2c927fb --- a/dhcpd/lang/ja_JP.euc +++ b/dhcpd/lang/ja_JP.euc @@ -222,9 +222,9 @@ index_start= index_subtitle=֥ͥåȤȶͭͥåȥ index_subtoomany=֥ͥåȤο¿ɽǤޤ index_title=DHCP -index_togroup=롼 -index_toshared=ͥåȥ -index_tosubnet=֥ͥå +index_togroup=롼: +index_toshared=ͥåȥ: +index_tosubnet=֥ͥå: index_version=ISC DHCPd С $1 listl_active=ƥ listl_all=ƥ֤ӴڤΥ꡼򤹤٤ɽ diff --git a/dhcpd/lang/ja_JP.jis b/dhcpd/lang/ja_JP.jis old mode 100644 new mode 100755 index 75c8f1031..25f69abd2 --- a/dhcpd/lang/ja_JP.jis +++ b/dhcpd/lang/ja_JP.jis @@ -35,9 +35,9 @@ index_horder1= index_horder2=O index_horder3=n[hEFA AhX index_horder4=IP AhX -index_togroup=O[v -index_tosubnet=Tulbg -index_toshared=lbg[N +index_togroup=O[v: +index_tosubnet=Tulbg: +index_toshared=lbg[N: index_ndisplay=lbg[NƃTulbg̍ڕʂɕ\: index_norder0=蓖 index_norder1=t@C\ diff --git a/dhcpd/lang/ko_KR.euc b/dhcpd/lang/ko_KR.euc old mode 100644 new mode 100755 index f6add1946..fd3505cf3 --- a/dhcpd/lang/ko_KR.euc +++ b/dhcpd/lang/ko_KR.euc @@ -35,9 +35,9 @@ index_horder1= index_horder2≠ index_horder3=ϵ ּ index_horder4=IP ּ -index_togroup=׷ -index_tosubnet= -index_toshared=Ʈũ +index_togroup=׷: +index_tosubnet=: +index_toshared=Ʈũ: index_ndisplay= ǥ : index_norder0=Ҵ index_norder1= diff --git a/dhcpd/lang/nl b/dhcpd/lang/nl old mode 100644 new mode 100755 index cfd450151..5b378c3fd --- a/dhcpd/lang/nl +++ b/dhcpd/lang/nl @@ -256,9 +256,9 @@ index_subtitle=Subnetten en Gedeelde Netwerken index_subtoomany=Er zijn teveel subnetten om te laten zien. index_text=Bewerk de configuratie tekst file handmatig index_title=DHCP Server -index_togroup=Groep -index_toshared=Netwerk -index_tosubnet=Subnet +index_togroup=Groep: +index_toshared=Netwerk: +index_tosubnet=Subnet: index_version=ISC DHCPd versie $1 index_zone=Zone keys_alg=Algoritme diff --git a/dhcpd/lang/no b/dhcpd/lang/no old mode 100644 new mode 100755 index c1f006dcb..f77bc281a --- a/dhcpd/lang/no +++ b/dhcpd/lang/no @@ -257,9 +257,9 @@ index_subtitle=Subnett og delte nettverk index_subtoomany=Det er for mange subnett å vise. index_text=Rediger konfigurasjonsfil manuelt tekst index_title=DHCP tjener -index_togroup=Gruppe -index_toshared=Nettverk -index_tosubnet=Subnett +index_togroup=Gruppe: +index_toshared=Nettverk: +index_tosubnet=Subnett: index_version=ISC DHCPd versjon $1 index_zone=Sone keys_alg=Algoritme diff --git a/dhcpd/lang/pl b/dhcpd/lang/pl old mode 100644 new mode 100755 index 1c9503c59..6921082b1 --- a/dhcpd/lang/pl +++ b/dhcpd/lang/pl @@ -257,9 +257,9 @@ index_subtitle=Podsieci i sieci wsp index_subtoomany=Istnieje zbyt wiele wspdzielonych sieci, aby je wywietli. index_text=Rczna edycja pliku konfiguracyjnego index_title=Serwer DHCP -index_togroup=grupy -index_toshared=sieci -index_tosubnet=podsieci +index_togroup=grupy: +index_toshared=sieci: +index_tosubnet=podsieci: index_version=Wersja ISC DHCPd $1 index_zone=Strefa keys_alg=Algorytm diff --git a/dhcpd/lang/pt b/dhcpd/lang/pt old mode 100644 new mode 100755 diff --git a/dhcpd/lang/pt_BR b/dhcpd/lang/pt_BR old mode 100644 new mode 100755 index dd6748fa2..259553a02 --- a/dhcpd/lang/pt_BR +++ b/dhcpd/lang/pt_BR @@ -208,9 +208,9 @@ index_group=Grupo: index_nameip=Nome de computador ou IP index_net=Rede index_netmask=Mscara de rede -index_togroup=Grupo -index_tosubnet=Subrede -index_toshared=Rede +index_togroup=Grupo: +index_tosubnet=Subrede: +index_toshared=Rede: index_version=ISC DHCPd verso $1 index_subtoomany=H muitas subredes para mostrar index_shatoomany=H muitas redes compartilhadas para mostrar diff --git a/dhcpd/lang/ru_RU b/dhcpd/lang/ru_RU old mode 100644 new mode 100755 index 184c9349f..b946062bf --- a/dhcpd/lang/ru_RU +++ b/dhcpd/lang/ru_RU @@ -210,7 +210,7 @@ pool_deny= esh_groups= cdel_group= eacl_psg= -index_togroup= +index_togroup=: eacl_psh= eacl_pdg= sshared_nosubnet= '$1' . @@ -288,7 +288,7 @@ log_options_group= index_norder0= index_norder1= index_norder2=/ IP -index_tosubnet= +index_tosubnet=: log_delete_group= $1 index_parent= eopt_custom= @@ -314,7 +314,7 @@ acl_r= ehost_retsubn= acl_w= index_hostgroup=/ -index_toshared= +index_toshared=: log_create_host= $1 ssub_nosubnet= '$1' . ehost_retgroup= diff --git a/dhcpd/lang/ru_SU b/dhcpd/lang/ru_SU old mode 100644 new mode 100755 index c96f22d23..326b74a55 --- a/dhcpd/lang/ru_SU +++ b/dhcpd/lang/ru_SU @@ -41,9 +41,9 @@ index_return= index_start= DHCP . index_subtitle= index_title= DHCP -index_togroup= -index_toshared= -index_tosubnet= +index_togroup=: +index_toshared=: +index_tosubnet=: index_version=ISC DHCPd $1 butt_save= diff --git a/dhcpd/lang/sk b/dhcpd/lang/sk old mode 100644 new mode 100755 index 97cb7a0a5..48bcc27a7 --- a/dhcpd/lang/sk +++ b/dhcpd/lang/sk @@ -135,9 +135,9 @@ index_net=Sie index_netmask=Sieov maska index_stop=Zastavi server index_title=DHCP Server -index_togroup=Skupina -index_toshared=Sie -index_tosubnet=Subnet +index_togroup=Skupina: +index_toshared=Sie: +index_tosubnet=Subnet: index_zone=Zna keys_alg=Algoritmus keys_create=Vytvori TSIG ke diff --git a/dhcpd/lang/sv b/dhcpd/lang/sv old mode 100644 new mode 100755 index 355610faf..74bda8d2f --- a/dhcpd/lang/sv +++ b/dhcpd/lang/sv @@ -35,9 +35,9 @@ index_horder1=Filstruktur index_horder2=Namn index_horder3=Hrdvaruadress index_horder4=IP-adress -index_togroup=Grupp -index_tosubnet=Delnt -index_toshared=Ntverk +index_togroup=Grupp: +index_tosubnet=Delnt: +index_toshared=Ntverk: index_ndisplay=Ordna nt och delnt efter: index_norder0=Niv index_norder1=Filstruktur diff --git a/dhcpd/lang/tr b/dhcpd/lang/tr old mode 100644 new mode 100755 diff --git a/dhcpd/lang/uk_UA b/dhcpd/lang/uk_UA old mode 100644 new mode 100755 index 8b2ac782b..6669054dc --- a/dhcpd/lang/uk_UA +++ b/dhcpd/lang/uk_UA @@ -210,7 +210,7 @@ pool_deny= esh_groups= cdel_group= eacl_psg= -index_togroup= +index_togroup= : eacl_psh= eacl_pdg= sshared_nosubnet= '$1' . @@ -288,7 +288,7 @@ log_options_group= index_norder0= index_norder1= index_norder2='/ IP -index_tosubnet=ϳ +index_tosubnet=ϳ : log_delete_group= $1 index_parent= eopt_custom= @@ -314,7 +314,7 @@ acl_r= ehost_retsubn= acl_w= index_hostgroup=/ -index_toshared= +index_toshared= : log_create_host= $1 ssub_nosubnet= '$1' . ehost_retgroup= diff --git a/dhcpd/lang/zh_CN b/dhcpd/lang/zh_CN old mode 100644 new mode 100755 index f7ff36e11..492dfb849 --- a/dhcpd/lang/zh_CN +++ b/dhcpd/lang/zh_CN @@ -35,9 +35,9 @@ index_horder1= index_horder2= index_horder3=Ӳַ index_horder4=IPַ -index_togroup= -index_tosubnet= -index_toshared= +index_togroup=: +index_tosubnet=: +index_toshared=: index_ndisplay=ʾͨ index_norder0= index_norder1=ļṹ diff --git a/dhcpd/lang/zh_TW.Big5 b/dhcpd/lang/zh_TW.Big5 old mode 100644 new mode 100755 index 42b52aa6a..a5c6a6f06 --- a/dhcpd/lang/zh_TW.Big5 +++ b/dhcpd/lang/zh_TW.Big5 @@ -40,9 +40,9 @@ index_horder1= index_horder2=W index_horder3=w} index_horder4=IP} -index_togroup=s -index_tosubnet=l -index_toshared= +index_togroup=s: +index_tosubnet=l: +index_toshared=: index_ndisplay=ܺMlG index_norder0= index_norder1=ɮ׵c