Merge pull request #1641 from webmin/dev/fix-admin-check

Fix admin check
New version bump
2026-02-04 06:32:15 +00:00 · 2022-05-23 13:26:54 -07:00 · 2022-05-23 13:23:00 -07:00 · 2022-05-23 22:02:48 +03:00 · 2022-05-20 22:15:02 -07:00 · 2022-05-19 20:56:48 -07:00
976 changed files with 10149 additions and 2004 deletions
--- a/2
+++ b/2
@@ -215,7 +215,7 @@ More German translation updates, thanks to Raymond Vetter.
 ---- Changes since 1.730 ----
 More German translation updates, thanks to Raymond Vetter.
 Norwegian updates, thanks to Stein-Aksel Basma.
-The awesome new Authentic Theme by Ilia Rostovtsev is now included in the Webmin package.
+The awesome new Authentic Theme by @iliajie is now included in the Webmin package.
 Catalan translation updates from Jaume Badiella.
 ---- Changes since 1.740 ----
 Norwegian updates, thanks to Stein-Aksel Basma.
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Webmin can be installed in two different ways:
 1. By downloading a pre-built package, available for different distributions (CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris and [other](http://www.webmin.com/support.html)) from our [download page](http://webmin.com/download.html);
  <kbd>Note: It is highly recommended to [add repository](https://doxfer.webmin.com/Webmin/Installation) to your system for having automatic updates.</kbd>

- 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.982.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
+ 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.994.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
  <kbd>Note: If you are installing Webmin [on Windows](http://www.webmin.com/windows.html) system, you must run the command `perl setup.pl` instead. The Windows version depends on several programs, and modules that may not be part of the standard distribution. You will need _process.exe_ commmand, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>

 ## Documentation
@@ -44,7 +44,7 @@ Complete set of documentation for Webmin and all of its modules can be found at
 ### Contributors

 * [Joe Cooper](https://github.com/swelljoe)
-* [Ilia Rostovtsev](https://github.com/rostovtsev)
+* [Ilia Rostovtsev](https://github.com/iliajie)
 * [Kay Marquardt](https://github.com/gnadelwartz)
 * [Nawawi Jamili](https://github.com/nawawi) + [57 more..](https://github.com/webmin/webmin/graphs/contributors)

--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,23 @@
+## Reporting Security Issues
+
+Please send all reports of security issues found in Webmin to security@webmin.com
+via email, ideally PGP encrypted with the key from https://www.webmin.com/jcameron-key.asc .
+
+Potential security issues, in descending order of impact, include :
+
+* Remotely exploitable attacks that allow `root` access to Webmin without
+  any credentials.
+
+* Privilege escalation vulnerabilities that allow non-`root` users of Webmin
+  to run commands or access files as `root`.
+
+* XSS attacks that target users already logged into Webmin when they visit
+  another website.
+
+Things that are not actually security issues include :
+
+* XSS attacks that are blocked by Webmin's referrer checks, which are enabled
+  by default.
+
+* Attacks that require modifications to Webmin's code or configuration, which
+  can only be done by someone who already has `root` permissions.
--- a/WebminCore.pm
+++ b/WebminCore.pm
--- a/acl/acl-lib.pl
+++ b/acl/acl-lib.pl
@@ -651,7 +651,7 @@ else {
 	my $deny = $user->{'deny'};
 	$deny =~ s/:/;/g if ($deny);
 	foreach my $l (@pwfile) {
-		if ($l =~ /^([^:]+):([^:]*)/ && $1 eq $username) {
+		if ($l =~ /^([^:]+):([^:\r\n]*)/ && $1 eq $username) {
 			&add_old_password($user, "$2", \%miniserv);
 			&print_tempfile($fh,
 				$user->{'name'},":",
@@ -1953,6 +1953,7 @@ return 1 if ($found >= 0);		# Already setup

 # Grant access to the user and path
 &lock_file(&get_miniserv_config_file());
+$user ||= '';
 push(@anon, "$path=$user");
 $miniserv->{'anonymous'} = join(" ", @anon);
 &put_miniserv_config($miniserv);
--- a/acl/delete_session.cgi
+++ b/acl/delete_session.cgi
@@ -13,5 +13,6 @@ my %miniserv;
 &get_miniserv_config(\%miniserv);
 &delete_session_id(\%miniserv, $in{'id'});
 &restart_miniserv();
-&redirect("list_sessions.cgi");
+&redirect($in{'redirect_ref'} ?
+    &get_referer_relative() : "list_sessions.cgi");

--- a/acl/lang/af.auto
+++ b/acl/lang/af.auto
@@ -351,6 +351,7 @@ sessions_login=Laaste aktief om
 sessions_host=IP adres
 sessions_lview=Bekyk logboeke..
 sessions_actions=Optrede..
+sessions_all=Alle sessies..
 sessions_logouts=Toon ook afgemelde sessies..
 sessions_state=staat
 sessions_this=Hierdie aanmelding
--- a/acl/lang/ar.auto
+++ b/acl/lang/ar.auto
@@ -239,6 +239,7 @@ sessions_login=آخر نشاط في
 sessions_host=عنوان IP
 sessions_lview=عرض السجلات..
 sessions_actions=أجراءات..
+sessions_all=كل الجلسات..
 sessions_logouts=اعرض أيضًا جلسات تسجيل الخروج..
 sessions_state=حالة
 sessions_this=هذا تسجيل الدخول
--- a/acl/lang/be.auto
+++ b/acl/lang/be.auto
@@ -351,6 +351,7 @@ sessions_login=Апошні раз быў у
 sessions_host=IP-адрас
 sessions_lview=Прагляд часопісаў..
 sessions_actions=Дзеянні..
+sessions_all=Усе сеансы..
 sessions_logouts=Таксама паказаць выходныя сесіі.
 sessions_state=Дзярж
 sessions_this=Гэта ўваход
--- a/acl/lang/bg.auto
+++ b/acl/lang/bg.auto
@@ -10,6 +10,8 @@ save_eunixname=Потребителското име '$1' не е потреби

 sync_modify=Преименувайте съответстващия потребител на Webmin, когато потребител на Unix е преименуван.

+sessions_all=Всички сесии..
+
 sql_nocache0=Кеш връзки към база данни
 sql_nocache1=Отворете нова връзка за всяко търсене
 sql_timeout_def=Използвайте времето за изчакване на връзката по подразбиране (60 секунди)
--- a/acl/lang/ca.auto
+++ b/acl/lang/ca.auto
@@ -10,6 +10,8 @@ save_eunixname=El nom d'usuari '$1' no és un usuari Unix, per la qual cosa no e

 sync_modify=Canvieu el nom de l'usuari Webmin coincident quan es canvia el nom d'un usuari Unix.

+sessions_all=Totes les sessions..
+
 sql_nocache0=Connexions de memòria cau a la base de dades
 sql_nocache1=Obriu una connexió nova per a cada cerca
 sql_timeout_def=Utilitza el temps d'espera de connexió predeterminat (60 segons)
--- a/acl/lang/cs.auto
+++ b/acl/lang/cs.auto
@@ -61,6 +61,7 @@ unix_header=Nastavení ověřování uživatelů Unixu
 unix_utable=Povolení uživatelé Unixu

 sessions_actions=Akce..
+sessions_all=Všechny relace..
 sessions_logouts=Zobrazit také odhlášené relace.
 sessions_state=Stát
 sessions_this=Toto přihlášení
--- a/acl/lang/da.auto
+++ b/acl/lang/da.auto
@@ -10,6 +10,8 @@ save_eunixname=Brugernavnet '$1' er ikke en Unix-bruger, og kan derfor ikke brug

 sync_modify=Omdøb den matchende Webmin-bruger, når en Unix-bruger omdøbes.

+sessions_all=Alle sessioner..
+
 sql_nocache0=Cache-forbindelser til databasen
 sql_nocache1=Åbn en ny forbindelse til hvert opslag
 sql_timeout_def=Brug standardforbindelse timeout (60 sekunder)
--- a/acl/lang/de.auto
+++ b/acl/lang/de.auto
@@ -1,5 +1,7 @@
 sync_modify=Benennen Sie den passenden Webmin-Benutzer um, wenn ein Unix-Benutzer umbenannt wird.

+sessions_all=Alle Sitzungen..
+
 sql_nocache0=Cache-Verbindungen zur Datenbank
 sql_nocache1=Öffnen Sie für jede Suche eine neue Verbindung
 sql_timeout_def=Standard-Verbindungszeitlimit verwenden (60 Sekunden)
--- a/acl/lang/el.auto
+++ b/acl/lang/el.auto
@@ -10,6 +10,8 @@ save_eunixname=Το όνομα χρήστη '$1' δεν είναι χρήστη

 sync_modify=Μετονομάστε τον αντίστοιχο χρήστη Webmin όταν μετονομάζεται ένας χρήστης Unix.

+sessions_all=Όλες οι συνεδρίες..
+
 sql_nocache0=Συνδέσεις προσωρινής μνήμης με βάση δεδομένων
 sql_nocache1=Ανοίξτε μια νέα σύνδεση για κάθε αναζήτηση
 sql_timeout_def=Χρήση προεπιλεγμένου χρονικού ορίου σύνδεσης (60 δευτερόλεπτα)
--- a/acl/lang/en
+++ b/acl/lang/en
@@ -351,6 +351,7 @@ sessions_login=Last active at
 sessions_host=IP address
 sessions_lview=View logs..
 sessions_actions=Actions..
+sessions_all=All sessions..
 sessions_logouts=Also show logged-out sessions..
 sessions_state=State
 sessions_this=This login
--- a/acl/lang/es.auto
+++ b/acl/lang/es.auto
@@ -13,6 +13,7 @@ delete_eanonuser=Este usuario se está utilizando para acceder al módulo anóni
 sync_modify=Cambie el nombre del usuario de Webmin coincidente cuando se cambie el nombre de un usuario de Unix.

 sessions_actions=Comportamiento..
+sessions_all=Todas las sesiones..
 sessions_logouts=Mostrar también sesiones cerradas.
 sessions_state=Estado
 sessions_this=Este inicio de sesión
--- a/acl/lang/eu.auto
+++ b/acl/lang/eu.auto
@@ -57,6 +57,7 @@ unix_header=Unix erabiltzailearen autentifikazio ezarpenak
 unix_utable=Onartutako Unix erabiltzaileak

 sessions_actions=Ekintzak..
+sessions_all=Saio guztiak..
 sessions_logouts=Erakutsi itxitako saioak ere..
 sessions_state=Estatu
 sessions_this=Saioa hasiera
--- a/acl/lang/fa.auto
+++ b/acl/lang/fa.auto
@@ -112,6 +112,7 @@ unix_utable=کاربران مجاز Unix

 sessions_host=آدرس آی پی
 sessions_actions=اقدامات..
+sessions_all=تمام جلسات..
 sessions_logouts=همچنین جلسات ورود به سیستم را نشان دهید..
 sessions_state=دولت
 sessions_this=این ورود
--- a/acl/lang/fi.auto
+++ b/acl/lang/fi.auto
@@ -351,6 +351,7 @@ sessions_login=Viimeksi aktiivinen klo
 sessions_host=IP-osoite
 sessions_lview=Näytä lokit..
 sessions_actions=Toiminnot..
+sessions_all=Kaikki istunnot..
 sessions_logouts=Näytä myös kirjautuneet istunnot..
 sessions_state=Osavaltio
 sessions_this=Tämä kirjautuminen
--- a/acl/lang/fr.auto
+++ b/acl/lang/fr.auto
@@ -56,6 +56,8 @@ unix_esudomod=Le module Perl $1 nécessaire à l'authentification <tt>sudo</tt>
 unix_header=Paramètres d'authentification utilisateur Unix
 unix_utable=Utilisateurs Unix autorisés

+sessions_all=Toutes les séances..
+
 udeletes_jerr=Échec de l'ajout d'utilisateurs au groupe

 pass_header=Options d'application de mot de passe Webmin
--- a/acl/lang/he.auto
+++ b/acl/lang/he.auto
@@ -351,6 +351,7 @@ sessions_login=פעיל לאחרונה בשעה
 sessions_host=כתובת ה - IP
 sessions_lview=הצגת יומנים..
 sessions_actions=פעולות..
+sessions_all=כל המפגשים..
 sessions_logouts=הראה גם הפעלות לא מחוברות..
 sessions_state=מדינה
 sessions_this=כניסה זו
--- a/acl/lang/hr.auto
+++ b/acl/lang/hr.auto
@@ -62,6 +62,7 @@ unix_header=Unix postavke provjere autentičnosti korisnika
 unix_utable=Dopušteni Unix korisnici

 sessions_actions=Akcije..
+sessions_all=Sve sesije..
 sessions_logouts=Prikaži i odjavljene sesije..
 sessions_state=država
 sessions_this=Ova prijava
--- a/acl/lang/hu.auto
+++ b/acl/lang/hu.auto
@@ -88,6 +88,7 @@ unix_header=Unix felhasználói hitelesítési beállítások
 unix_utable=Engedélyezett Unix felhasználók

 sessions_actions=Hozzászólások..
+sessions_all=Minden ülés..
 sessions_logouts=A kijelentkezett munkamenetek megjelenítése is
 sessions_state=Állapot
 sessions_this=Ez a bejelentkezés
--- a/acl/lang/it.auto
+++ b/acl/lang/it.auto
@@ -37,6 +37,7 @@ unix_header=Impostazioni di autenticazione utente Unix
 unix_utable=Utenti Unix consentiti

 sessions_actions=Azioni..
+sessions_all=Tutte le sessioni..
 sessions_logouts=Mostra anche sessioni disconnesse.
 sessions_state=Stato
 sessions_this=Questo login
--- a/acl/lang/ja.auto
+++ b/acl/lang/ja.auto
@@ -59,6 +59,7 @@ unix_header=Unixユーザー認証設定
 unix_utable=許可されたUnixユーザー

 sessions_actions=行動..
+sessions_all=すべてのセッション。
 sessions_logouts=ログアウトしたセッションも表示します。
 sessions_state=状態
 sessions_this=このログイン
--- a/acl/lang/ko.auto
+++ b/acl/lang/ko.auto
@@ -59,6 +59,7 @@ unix_header=유닉스 사용자 인증 설정
 unix_utable=허용 된 유닉스 사용자

 sessions_actions=행위..
+sessions_all=모든 세션..
 sessions_logouts=로그 아웃 된 세션도 표시하십시오.
 sessions_state=상태
 sessions_this=이 로그인
--- a/acl/lang/lt.auto
+++ b/acl/lang/lt.auto
@@ -351,6 +351,7 @@ sessions_login=Paskutinį kartą aktyvus
 sessions_host=IP adresas
 sessions_lview=Žiūrėti žurnalus..
 sessions_actions=Veiksmai..
+sessions_all=Visi užsiėmimai..
 sessions_logouts=Taip pat rodyti atsijungusius seansus..
 sessions_state=Valstybė
 sessions_this=Šis prisijungimas
--- a/acl/lang/lv.auto
+++ b/acl/lang/lv.auto
@@ -351,6 +351,7 @@ sessions_login=Pēdējo reizi aktīvs plkst
 sessions_host=IP adrese
 sessions_lview=Skatīt žurnālus..
 sessions_actions=Darbības..
+sessions_all=Visas sesijas..
 sessions_logouts=Rādīt arī atteikšanās sesijas..
 sessions_state=Valsts
 sessions_this=Šī pieteikšanās
--- a/acl/lang/ms.auto
+++ b/acl/lang/ms.auto
@@ -13,6 +13,7 @@ delete_eanonuser=Pengguna ini sedang digunakan untuk akses modul tanpa nama
 sync_modify=Ganti nama pengguna Webmin yang sepadan apabila pengguna Unix dinamakan semula.

 sessions_actions=Tindakan..
+sessions_all=Semua sesi..
 sessions_logouts=Juga tunjukkan sesi log keluar..
 sessions_state=Negeri
 sessions_this=Log masuk ini
--- a/acl/lang/mt.auto
+++ b/acl/lang/mt.auto
@@ -351,6 +351,7 @@ sessions_login=L-aħħar attiv fi
 sessions_host=Indirizz IP
 sessions_lview=Ara zkuk..
 sessions_actions=Azzjonijiet..
+sessions_all=Is-sessjonijiet kollha..
 sessions_logouts=Uri wkoll sessjonijiet illoggjati..
 sessions_state=Stat
 sessions_this=Dan id-dħul
--- a/acl/lang/nl.auto
+++ b/acl/lang/nl.auto
@@ -36,6 +36,7 @@ unix_header=Unix-instellingen voor gebruikersauthenticatie
 unix_utable=Toegestane Unix-gebruikers

 sessions_actions=Acties..
+sessions_all=Alle sessies..
 sessions_logouts=Toon ook uitgelogde sessies..
 sessions_state=Staat
 sessions_this=Deze login
--- a/acl/lang/no.auto
+++ b/acl/lang/no.auto
@@ -1,5 +1,7 @@
 sync_modify=Gi nytt navn til den samsvarende Webmin-brukeren når en Unix-bruker får nytt navn.

+sessions_all=Alle økter..
+
 sql_nocache0=Cache-tilkoblinger til databasen
 sql_nocache1=Åpne en ny forbindelse for hvert oppslag
 sql_timeout_def=Bruk standard tilkoblingstimeout (60 sekunder)
--- a/acl/lang/pl.auto
+++ b/acl/lang/pl.auto
@@ -11,6 +11,7 @@ save_eunixname=Nazwa użytkownika „$1” nie jest użytkownikiem systemu Unix,
 sync_modify=Zmień nazwę pasującego użytkownika Webmin, gdy zmieniona zostanie nazwa użytkownika Uniksa.

 sessions_actions=Działania..
+sessions_all=Wszystkie sesje...
 sessions_logouts=Pokaż także wylogowane sesje.
 sessions_state=Stan
 sessions_this=Ten login
--- a/acl/lang/pt.auto
+++ b/acl/lang/pt.auto
@@ -327,6 +327,7 @@ sessions_login=Ativo pela última vez às
 sessions_host=endereço de IP
 sessions_lview=Ver registros..
 sessions_actions=Ações..
+sessions_all=Todas as sessões..
 sessions_logouts=Mostrar também sessões desconectadas.
 sessions_state=Estado
 sessions_this=Este login
--- a/acl/lang/pt_BR.auto
+++ b/acl/lang/pt_BR.auto
@@ -55,6 +55,7 @@ unix_header=Configurações de autenticação de usuário Unix
 unix_utable=Usuários Unix permitidos

 sessions_actions=Ações..
+sessions_all=Todas as sessões..
 sessions_logouts=Mostrar também sessões desconectadas.
 sessions_state=Estado
 sessions_this=Este login
--- a/acl/lang/ro.auto
+++ b/acl/lang/ro.auto
@@ -351,6 +351,7 @@ sessions_login=Ultima activitate la
 sessions_host=adresa IP
 sessions_lview=Vizualizați jurnalele..
 sessions_actions=Acțiuni..
+sessions_all=Toate sesiunile..
 sessions_logouts=Arată, de asemenea, sesiuni deconectate..
 sessions_state=Stat
 sessions_this=Această autentificare
--- a/acl/lang/ru.auto
+++ b/acl/lang/ru.auto
@@ -59,6 +59,7 @@ unix_header=Настройки аутентификации пользовате
 unix_utable=Разрешенные пользователи Unix

 sessions_actions=Действия..
+sessions_all=Все сеансы..
 sessions_logouts=Также показать сеансы выхода из системы.
 sessions_state=состояние
 sessions_this=Этот логин
--- a/acl/lang/sk.auto
+++ b/acl/lang/sk.auto
@@ -104,6 +104,7 @@ unix_header=Nastavenia overovania používateľov systému Unix
 unix_utable=Povolení používatelia Unixu

 sessions_actions=Akcia..
+sessions_all=Všetky relácie..
 sessions_logouts=Zobraziť aj odhlásené relácie.
 sessions_state=Štát
 sessions_this=Toto prihlásenie
--- a/acl/lang/sl.auto
+++ b/acl/lang/sl.auto
@@ -351,6 +351,7 @@ sessions_login=Nazadnje aktivno ob
 sessions_host=IP naslov
 sessions_lview=Prikaži dnevnike..
 sessions_actions=Ukrepi..
+sessions_all=Vse seje..
 sessions_logouts=Prikaži tudi odjavne seje.
 sessions_state=Država
 sessions_this=Ta prijava
--- a/acl/lang/sv.auto
+++ b/acl/lang/sv.auto
@@ -59,6 +59,7 @@ unix_header=Unix inställningar för användarautentisering
 unix_utable=Tillåtna Unix-användare

 sessions_actions=Handlingar..
+sessions_all=Alla sessioner..
 sessions_logouts=Visa även utloggade sessioner..
 sessions_state=stat
 sessions_this=Den här inloggningen
--- a/acl/lang/th.auto
+++ b/acl/lang/th.auto
@@ -351,6 +351,7 @@ sessions_login=ใช้งานล่าสุดเวลา
 sessions_host=ที่อยู่ IP
 sessions_lview=ดูบันทึก..
 sessions_actions=การดำเนินการ..
+sessions_all=ทุกวาระ..
 sessions_logouts=แสดงเซสชันการออกจากระบบด้วย..
 sessions_state=สถานะ
 sessions_this=เข้าสู่ระบบนี้
--- a/acl/lang/tr.auto
+++ b/acl/lang/tr.auto
@@ -120,6 +120,7 @@ unix_utable=İzin verilen Unix kullanıcıları

 sessions_host=IP adresi
 sessions_actions=Hareketler..
+sessions_all=Tüm oturumlar..
 sessions_logouts=Oturumu kapatılmış oturumları da göster..
 sessions_state=Durum
 sessions_this=Bu giriş
--- a/acl/lang/uk.auto
+++ b/acl/lang/uk.auto
@@ -346,6 +346,7 @@ sessions_login=Останній активний о
 sessions_host=IP-адреса
 sessions_lview=Переглянути журнали..
 sessions_actions=Дії..
+sessions_all=Всі сеанси..
 sessions_logouts=Показати також сеанси виходу з системи..
 sessions_state=Держава
 sessions_this=Це логін
--- a/acl/lang/ur.auto
+++ b/acl/lang/ur.auto
@@ -351,6 +351,7 @@ sessions_login=آخری فعال
 sessions_host=IP پتہ
 sessions_lview=نوشتہ جات دیکھیں..
 sessions_actions=عمل..
+sessions_all=تمام سیشنز..
 sessions_logouts=لاگ آؤٹ سیشن بھی دکھائیں..
 sessions_state=حالت
 sessions_this=یہ لاگ ان
--- a/acl/lang/vi.auto
+++ b/acl/lang/vi.auto
@@ -351,6 +351,7 @@ sessions_login=Hoạt động lần cuối tại
 sessions_host=địa chỉ IP
 sessions_lview=Xem các bản ghi..
 sessions_actions=Hành động..
+sessions_all=Tất cả các phiên..
 sessions_logouts=Cũng hiển thị các phiên đăng xuất..
 sessions_state=Tiểu bang
 sessions_this=Thông tin đăng nhập này
--- a/acl/lang/zh.auto
+++ b/acl/lang/zh.auto
@@ -160,6 +160,7 @@ sessions_login=上次活动时间：
 sessions_host=IP地址
 sessions_lview=查看日志
 sessions_actions=动作..
+sessions_all=所有会议..
 sessions_logouts=同时显示注销的会话。
 sessions_state=州
 sessions_this=此登录名
--- a/acl/lang/zh_TW.auto
+++ b/acl/lang/zh_TW.auto
@@ -138,6 +138,7 @@ unix_utable=允許的Unix用戶

 sessions_host=IP地址
 sessions_actions=動作..
+sessions_all=所有會議..
 sessions_logouts=還顯示註銷的會話。
 sessions_state=州
 sessions_this=此登錄名
--- a/acl/system_info.pl
+++ b/acl/system_info.pl
@@ -11,6 +11,7 @@ sub list_system_info
 my ($data, $in) = @_;
 my @rv;
 my %miniserv;
+my $haslog = &foreign_available("webminlog");
 &get_miniserv_config(\%miniserv);
 &open_session_db(\%miniserv);
 my @logins;
@@ -32,6 +33,8 @@ if (@logins) {
 	my $open = 0;
 	foreach my $l (@logins) {
 		my $state;
+		my $candel = 0;
+		my $nbsp = "&nbsp;&nbsp;&nbsp;";
 		if ($l->[0] =~ /^\!/) {
 			$state = $text{'sessions_out'};
 			}
@@ -41,13 +44,24 @@ if (@logins) {
 			}
 		else {
 			$state = $text{'sessions_in'};
+			$candel = 1;
 			if ($l->[2] ne $ENV{'REMOTE_HOST'}) {
 				$open++;
 				$state = "<font color=orange>$state</font>";
 				}
 			}
 		$main::theme_allow_make_date = 1;
-		$html .= &ui_columns_row([ $l->[2],
+		$html .= &ui_columns_row([ $l->[2] . 
+		             ($haslog ?
+		             	$nbsp . &ui_link("@{[&get_webprefix()]}/webminlog/search.cgi?uall=1&mall=1&tall=1&wall=1&fall=1&sid=$l->[3]",
+		             		$text{'sessions_lview'}) : undef) .
+		             ($candel ? (!$haslog ? $nbsp : undef) .
+		             	&ui_link("@{[&get_webprefix()]}/acl/delete_session.cgi?id=$l->[3]&redirect_ref=1",
+		             		$text{'sessions_kill'}) : undef) .
+		             ((!$haslog && !$candel ? $nbsp : undef) .
+		             	&ui_link("@{[&get_webprefix()]}/acl/list_sessions.cgi",
+		             		$text{'sessions_all'}, undef, "title=\"$text{'sessions_title'}\"")),
+
 					   &make_date($l->[1]),
 					   $state ]);
 		}
--- a/apache/apache-lib.pl
+++ b/apache/apache-lib.pl
@@ -124,7 +124,7 @@ foreach my $d (&get_httpd_defines()) {
 		}
 	}
 while($line = <$fh>) {
-	chop;
+	$line =~ s/\r|\n//g;
 	$line =~ s/^\s*#.*$//g;
 	if ($line =~ /^\s*<\/(\S+)\s*(.*)>/) {
 		# end of a container directive. This can only happen in a
@@ -144,6 +144,11 @@ while($line = <$fh>) {
 		$altmod =~ s/^(\S+)_module$/mod_$1/g;
 		local $mpmmod = $mod;
 		$mpmmod =~ s/^mpm_//; $mpmmod =~ s/_module$//;
+		if ($mod eq "prefork") {
+			# Special case for all the prefork aliases
+			($mod, $altmod, $mpmmod) = ("mod_".$mod."_module",
+						    "mod_mpm_".$mod, $mod);
+			}
 		if (!$not && $httpd_modules{$mod} ||
 		    $not && !$httpd_modules{$mod} ||
 		    !$not && $httpd_modules{$altmod} ||
@@ -2168,23 +2173,6 @@ foreach my $l (@{$conf_lref}) {
 if ($conf_block_opening == $conf_block_closing) {

    my $conf_lvl = 0;
-    my $conf_prev_line;
-    my $conf_curr_line;
-    my $conf_virthost;
-    my @confs_separate =
-           (
-           	'Protocols',
-           	'SuexecUserGroup',
-           	'ServerName',
-           	'ScriptAlias',
-           	'DocumentRoot',
-           	'ErrorLog',
-           	'DirectoryIndex',
-           	'Alias',
-           	'RewriteEngine',
-           	'Fcgid',
-           	'SSL',
-           );
    foreach my $l (@{$conf_lref}) {
        my $indent_current = $indent x $conf_lvl;

@@ -2194,59 +2182,20 @@ if ($conf_block_opening == $conf_block_closing) {
            # Indent up next line if a new block
            if ($l =~ /(<[a-zA-Z]+).*>/) {
                $conf_lvl++;
-                if ($l =~ /(<VirtualHost).*>/) {
-                	$conf_virthost++;
-                	}
                }

            # Indent down next line if a closing block
            if ($l =~ /(<\/[a-zA-Z]+).*>/) {
                $conf_lvl--;

-                if ($l =~ /(<\/VirtualHost).*>/) {
-                	$conf_virthost--;
-                	}
-
                # Change current indent right now as it is a closing block
                $indent_current = $indent x $conf_lvl;
                }
            }

-        # Store previous and current lines
-        $conf_prev_line = &trim($conf_curr_line);
-        $conf_curr_line = &trim($l);
-
        # Replace beginning spaces with needed indent
        $l =~ s/^\s*/$indent_current/
            if($l);
-        
-
-        # Check if current line needs to be prepended
-        # with a new line for better readability
-        if (!$config{'format_config_lines'}) {
-            # Allow new line insertion only inside of VirtualHost block
-            if ($conf_virthost) {
-                # If current line is not part of a commented block
-                if ($conf_curr_line !~ /^\s*#/) {
-                    # If previous line is not already an empty line
-                    if (length($conf_prev_line)) {
-                        # If the previous line was something 
-                        # we want to take a break before and after match
-                        if (grep {$conf_curr_line =~ /^$_/} @confs_separate &&
-                            grep {$conf_prev_line !~ /^$_/} @confs_separate) {
-                        	# If not the first directive in VirtualHost
-                        	if($conf_prev_line !~ /(^<VirtualHost).*>/) {
-                            	$l = "\n$l"
-                        		}
-                            }
-                        # If current is opening block
-                        elsif ($conf_curr_line =~ /(^<[a-zA-Z]+).*>/) {
-                            $l = "\n$l";
-                            }
-                        }
-                    }
-                }
-            }
        }
    }
 }
--- a/apache/create_virt.cgi
+++ b/apache/create_virt.cgi
@@ -217,15 +217,17 @@ push(@mems, @cmems);

 if ($in{'adddir'} && $in{'root'}) {
 	# Add a <Directory> section for the root
+	my @dmems;
+	if ($httpd_modules{'core'} < 2.4) {
+		push(@dmems, { 'name' => 'allow',
+			       'value' => 'from all' });
+		}
+	push(@dmems, { 'name' => 'Options',
+		       'value' => 'None' });
 	$dirsect = { 'name' => 'Directory',
 		     'value' => "\"$in{'root'}\"",
 		     'type' => 1,
-		     'members' => [
-			{ 'name' => 'allow',
-			  'value' => 'from all' },
-			{ 'name' => 'Options',
-			  'value' => 'None' },
-			],
+		     'members' => \@dmems,
 		   };
 	if ($httpd_modules{'core'} >= 2.4) {
 		# Apache 2.4+ needs a 'Require all granted' line
--- a/bandwidth/acl_security.pl
+++ b/bandwidth/acl_security.pl
@@ -5,17 +5,16 @@ do 'bandwidth-lib.pl';
 # Output HTML for editing security options for the acl module
 sub acl_security_form
 {
-print "<tr> <td><b>$text{'acl_setup'}</b></td> <td>\n";
-printf "<input type=radio name=setup value=1 %s> $text{'yes'}\n",
-	$o->{'setup'} ? 'checked' : '';
-printf "<input type=radio name=setup value=0 %s> $text{'no'}</td> </tr>\n",
-	$o->{'setup'} ? '' : 'checked';
+my ($o) = @_;
+print &ui_table_row($text{'acl_setup'},
+	&ui_yesno_radio("setup", $o->{'setup'}));
 }

 # acl_security_save(&options)
 # Parse the form for security options for the acl module
 sub acl_security_save
 {
-$_[0]->{'setup'} = $in{'setup'};
+my ($o) = @_;
+$o->{'setup'} = $in{'setup'};
 }

--- a/bandwidth/bandwidth-lib.pl
+++ b/bandwidth/bandwidth-lib.pl
@@ -8,12 +8,12 @@
 BEGIN { push(@INC, ".."); };
 use WebminCore;
 &init_config();
-if (&foreign_installed("syslog-ng")) {
-	&foreign_require("syslog-ng", "syslog-ng-lib.pl");
+if (&foreign_installed("syslog-ng", 1) == 2) {
+	&foreign_require("syslog-ng");
 	$syslog_module = "syslog-ng";
 	}
 elsif (&foreign_installed("syslog")) {
-	&foreign_require("syslog", "syslog-lib.pl");
+	&foreign_require("syslog");
 	$syslog_module = "syslog";
 	}
 else {
--- a/bandwidth/index.cgi
+++ b/bandwidth/index.cgi
@@ -124,54 +124,47 @@ elsif ($missingrule || !$sysconf) {
 if (@hours) {
 	# Show reporting form
 	print &ui_form_start("index.cgi");
-	print "<table>\n";
+	print &ui_table_start(undef, undef, 2);

-	print "<tr> <td><b>$text{'index_by'}</b></td>\n";
-	print "<td>",&ui_select("by", $in{'by'},
-		[ [ 'hour', $text{'index_hour'} ],
-		  [ 'day', $text{'index_day'} ],
-		  [ 'host', $text{'index_host'} ],
-		  [ 'proto', $text{'index_proto'} ],
-		  [ 'iport', $text{'index_iport'} ],
-		  [ 'oport', $text{'index_oport'} ],
-		  [ 'port', $text{'index_port'} ] ]),"</td>\n";
+	print &ui_table_row($text{'index_by'},
+		&ui_select("by", $in{'by'},
+			[ [ 'hour', $text{'index_hour'} ],
+			  [ 'day', $text{'index_day'} ],
+			  [ 'host', $text{'index_host'} ],
+			  [ 'proto', $text{'index_proto'} ],
+			  [ 'iport', $text{'index_iport'} ],
+			  [ 'oport', $text{'index_oport'} ],
+			  [ 'port', $text{'index_port'} ] ]));

-	print "<td><b>$text{'index_for'}</b></td>\n";
-	print "<td>",&ui_select("for", $in{'for'},
-		[ [ '', $text{'index_all'} ],
-		  [ 'host', $text{'index_forhost'} ],
-		  [ 'proto', $text{'index_forproto'} ],
-		  [ 'iport', $text{'index_foriport'} ],
-		  [ 'oport', $text{'index_foroport'} ] ]),"\n";
-	print &ui_textbox("what", $in{'for'} ? $in{'what'} : "", 20),
-	      "</td> </tr>\n";
+	print &ui_table_row($text{'index_for'},
+		&ui_select("for", $in{'for'},
+			[ [ '', $text{'index_all'} ],
+			  [ 'host', $text{'index_forhost'} ],
+			  [ 'proto', $text{'index_forproto'} ],
+			  [ 'iport', $text{'index_foriport'} ],
+			  [ 'oport', $text{'index_foroport'} ] ])." ".
+		&ui_textbox("what", $in{'for'} ? $in{'what'} : "", 20));

-	print "<tr> <td><b>$text{'index_from'}</b></td>\n";
-	print "<td colspan=4>",
+	print &ui_table_row($text{'index_from'},
 		&date_input($in{'from_day'}, $in{'from_month'},
-			    $in{'from_year'}, "from"),
-		&hourmin_input($in{'from_hour'}, "00", "from"),"</td> </tr>\n";
+			    $in{'from_year'}, "from").
+		&hourmin_input($in{'from_hour'}, "00", "from"));

-	print "<tr> <td><b>$text{'index_to'}</b></td>\n";
-	print "<td colspan=4>",
+	print &ui_table_row($text{'index_to'},
 		&date_input($in{'to_day'}, $in{'to_month'},
-			    $in{'to_year'}, "to"),
-		&hourmin_input($in{'to_hour'}, "00", "to"),"</td> </tr>\n";
+			    $in{'to_year'}, "to").
+		&hourmin_input($in{'to_hour'}, "00", "to"));

 	if (!%in) {
 		# Enable by default
 		$in{'low'} = 1;
 		}
-	print "<tr> <td></td> <td colspan=4>\n";
-	print &ui_checkbox("low", 1, $text{'index_low'}, $in{'low'});
-	print &ui_checkbox("resolv", 1, $text{'index_resolv'}, $in{'resolv'});
-	print "</td> </tr>\n";
+	print &ui_table_row("",
+		&ui_checkbox("low", 1, $text{'index_low'}, $in{'low'}).
+		&ui_checkbox("resolv", 1, $text{'index_resolv'}, $in{'resolv'}));

-	print "<tr> <td colspan=4>",
-		&ui_submit($text{'index_search'}),"</td> </td>\n";
-
-	print "</table>\n";
-	print &ui_form_end();
+	print &ui_table_end();
+	print &ui_form_end([ [ undef, $text{'index_search'} ] ]);
 	}
 elsif (!$missingrule && $sysconf) {
 	print "<b>$text{'index_none'}</b><p>\n";
@@ -344,37 +337,45 @@ if ($in{'by'}) {
 		@order = grep { $count{$_} } @order;
 		}
 	if (@order) {
-		print "<table width=100% cellpadding=0 cellspacing=0>\n";
-		print "<tr>\n";
-		print "<td><b>",$text{'index_h'.$in{'by'}},"</b></td>\n";
-		print "<td colspan=2><b>$text{'index_usage'}</b></td>\n";
-		print "</tr>\n";
-		$total = 0;
+		print &ui_columns_start([ $text{'index_h'.$in{'by'}},
+					  $text{'index_usage'},
+					  $text{'index_in'},
+					  $text{'index_out'},
+					  $text{'index_total'} ], 100, 0);
+		$itotal = $ototal = $total = 0;
 		foreach $k (@order) {
-			print "<tr>\n";
+			my @cols;
 			if ($in{'by'} eq 'hour') {
-				print "<td>",&make_date($k*60*60),"</td>\n";
+				push(@cols, &make_date($k*60*60));
 				}
 			elsif ($in{'by'} eq 'day') {
 				$date = &make_date_day($k*60*60);
-				print "<td>$date</td>\n";
+				push(@cols, $date);
 				}
 			else {
-				print "<td>$k</td>\n";
+				push(@cols, $k);
 				}
-			print "<td>";
-			printf "<img src=images/red.gif width=%d height=10>",
+			my $bar = sprintf
+				"<img src=images/red.gif width=%d height=10>",
 				$max ? int($width * $icount{$k}/$max)+1 : 1;
-			printf "<img src=images/blue.gif width=%d height=10>",
+			$bar .= sprintf
+				"<img src=images/blue.gif width=%d height=10>",
 				$max ? int($width * $ocount{$k}/$max)+1 : 1;
-			print "</td>";
-			print "<td>",&nice_size($count{$k}),"</td>\n";
+			push(@cols, $bar);
+			push(@cols, &nice_size($icount{$k}),
+				    &nice_size($ocount{$k}),
+				    &nice_size($count{$k}));
 			$total += $count{$k};
+			$itotal += $icount{$k};
+			$ototal += $ocount{$k};
 			print "</tr>\n";
+			print &ui_columns_row(\@cols);
 			}
-		print "<tr> <td colspan=2></td> <td><b>",
-		&nice_size($total),"</td> </tr>\n";
-		print "</table>\n";
+		print &ui_columns_row([ undef, undef,
+					&nice_size($itotal),
+					&nice_size($ototal),
+					&nice_size($total) ]);
+		print &ui_columns_end();
 		}
 	else {
 		print "<b>$text{'index_nomatch'}</b><p>\n";
--- a/bandwidth/lang/af.auto
+++ b/bandwidth/lang/af.auto
@@ -41,6 +41,9 @@ index_efrom=Ongeldige begindatum en tyd
 index_eto=Ongeldige einddatum en tyd
 index_err=Verslag kon nie gegenereer word nie
 index_usage=Netwerkverkeer <font color=#ff0000>afgelaai</font> en <font color=#0000ff>opgelaai</font>
+index_in=Aflaai
+index_out=Laai op
+index_total=Totaal
 index_hhour=Uur
 index_hhost=host
 index_hday=dag
--- a/bandwidth/lang/ar.auto
+++ b/bandwidth/lang/ar.auto
@@ -41,6 +41,9 @@ index_efrom=تاريخ ووقت البدء غير صالحين
 index_eto=تاريخ ووقت انتهاء غير صالحين
 index_err=فشل في إنشاء التقرير
 index_usage=تم تنزيل حركة مرور الشبكة <font color=#ff0000></font> و <font color=#0000ff>التي تم تحميلها</font>
+index_in=تحميل
+index_out=تحميل
+index_total=المجموع
 index_hhour=ساعة
 index_hhost=مضيف
 index_hday=يوم
--- a/bandwidth/lang/be.auto
+++ b/bandwidth/lang/be.auto
@@ -41,6 +41,9 @@ index_efrom=Несапраўдная дата і час пачатку
 index_eto=Дата і час канца несапраўдныя
 index_err=Не атрымалася стварыць справаздачу
 index_usage=Сеткавы трафік <font color=#ff0000>загружаны</font> і <font color=#0000ff>загружаны</font>
+index_in=Спампаваць
+index_out=Загрузіць
+index_total=Усяго
 index_hhour=Гадзіна
 index_hhost=Гаспадар
 index_hday=Дзень
--- a/bandwidth/lang/bg.auto
+++ b/bandwidth/lang/bg.auto
@@ -41,6 +41,9 @@ index_efrom=Невалидна начална дата и час
 index_eto=Невалидна крайна дата и час
 index_err=Неуспешно генериране на отчет
 index_usage=Мрежов трафик <font color=#ff0000>изтеглен</font> и <font color=#0000ff>качен</font>
+index_in=Изтегли
+index_out=Качване
+index_total=Обща сума
 index_hhour=час
 index_hhost=домакин
 index_hday=ден
--- a/bandwidth/lang/ca.auto
+++ b/bandwidth/lang/ca.auto
@@ -0,0 +1,3 @@
+index_in=descarregar
+index_out=Carrega
+index_total=Total
--- a/bandwidth/lang/cs.auto
+++ b/bandwidth/lang/cs.auto
@@ -41,6 +41,9 @@ index_efrom=Neplatné počáteční datum a čas
 index_eto=Neplatné datum a čas ukončení
 index_err=Generování zprávy se nezdařilo
 index_usage=Síťový provoz <font color=#ff0000>staženo</font> a <font color=#0000ff>uploaded</font>
+index_in=Stažení
+index_out=nahrát
+index_total=Celkový
 index_hhour=Hodina
 index_hhost=Hostitel
 index_hday=Den
--- a/bandwidth/lang/da.auto
+++ b/bandwidth/lang/da.auto
@@ -41,6 +41,9 @@ index_efrom=Ugyldig startdato og tid
 index_eto=Ugyldig slutdato og tid
 index_err=Rapporten blev ikke genereret
 index_usage=Netværkstrafik <font color=#ff0000>downloadet</font> og <font color=#0000ff>uploadet</font>
+index_in=Hent
+index_out=Upload
+index_total=i alt
 index_hhour=Time
 index_hhost=Vært
 index_hday=Dag
--- a/bandwidth/lang/de.auto
+++ b/bandwidth/lang/de.auto
@@ -0,0 +1,3 @@
+index_in=Download
+index_out=Hochladen
+index_total=Gesamt
--- a/bandwidth/lang/el.auto
+++ b/bandwidth/lang/el.auto
@@ -41,6 +41,9 @@ index_efrom=Μη έγκυρη ημερομηνία και ώρα έναρξης
 index_eto=Μη έγκυρη ημερομηνία και ώρα λήξης
 index_err=Αποτυχία δημιουργίας αναφοράς
 index_usage=Η διακίνηση δικτύου <font color=#ff0000>κατέβασμα</font> και <font color=#0000ff>ανέβηκε</font>
+index_in=Κατεβάστε
+index_out=Μεταφόρτωση
+index_total=Σύνολο
 index_hhour=Ωρα
 index_hhost=Πλήθος
 index_hday=Ημέρα
--- a/bandwidth/lang/en
+++ b/bandwidth/lang/en
@@ -41,6 +41,9 @@ index_efrom=Invalid starting date and time
 index_eto=Invalid ending date and time
 index_err=Failed to generate report
 index_usage=Network traffic <font color=#ff0000>downloaded</font> and <font color=#0000ff>uploaded</font>
+index_in=Download
+index_out=Upload
+index_total=Total
 index_hhour=Hour
 index_hhost=Host
 index_hday=Day
--- a/bandwidth/lang/es.auto
+++ b/bandwidth/lang/es.auto
@@ -2,6 +2,9 @@ index_emod=El módulo Webmin $1 no está instalado en este sistema o no es compa
 index_esyslog=Ninguno de los módulos de registros del sistema está instalado en este sistema y es compatible con su sistema operativo. El módulo de monitoreo de ancho de banda no puede funcionar sin uno de ellos.
 index_setupdesc2=<b>Advertencia: este módulo registrará TODO el tráfico de red enviado o recibido en la interfaz seleccionada. Esto consumirá una gran cantidad de espacio en disco y tiempo de CPU en una conexión de red rápida.</b>
 index_other=Otro ..
+index_in=Descargar
+index_out=Subir
+index_total=Total

 setup_eiface=Nombre de interfaz faltante o no válido

--- a/bandwidth/lang/eu.auto
+++ b/bandwidth/lang/eu.auto
@@ -41,6 +41,9 @@ index_efrom=Hasierako data eta ordua baliogabeak
 index_eto=Amaiera data eta ordua baliogabea
 index_err=Ezin izan da txostena sortu
 index_usage=Sareko trafikoa <font color=#ff0000>deskargatu</font> eta <font color=#0000ff>kargatuta</font>
+index_in=Deskargatu
+index_out=Kargatu
+index_total=Guztira
 index_hhour=Ordua
 index_hhost=ostalaria
 index_hday=eguna
--- a/bandwidth/lang/fa.auto
+++ b/bandwidth/lang/fa.auto
@@ -41,6 +41,9 @@ index_efrom=تاریخ و زمان شروع نامعتبر است
 index_eto=تاریخ و زمان پایان نامعتبر
 index_err=گزارش ایجاد نشد
 index_usage=ترافیک شبکه <font color=#ff0000>بارگیری شده</font> و <font color=#0000ff>بارگذاری شد</font>
+index_in=دانلود
+index_out=بارگذاری
+index_total=جمع
 index_hhour=ساعت
 index_hhost=میزبان
 index_hday=روز
--- a/bandwidth/lang/fi.auto
+++ b/bandwidth/lang/fi.auto
@@ -41,6 +41,9 @@ index_efrom=Virheellinen aloituspäivä ja -aika
 index_eto=Virheellinen lopetuspäivämäärä ja -aika
 index_err=Raportin luonti epäonnistui
 index_usage=Verkkoliikenne <font color=#ff0000>ladattu</font> ja <font color=#0000ff>ladattu</font>
+index_in=ladata
+index_out=Lataa
+index_total=Kaikki yhteensä
 index_hhour=Tunnin
 index_hhost=isäntä
 index_hday=Päivä
--- a/bandwidth/lang/fr.auto
+++ b/bandwidth/lang/fr.auto
@@ -0,0 +1,3 @@
+index_in=Télécharger
+index_out=Télécharger
+index_total=Total
--- a/bandwidth/lang/he.auto
+++ b/bandwidth/lang/he.auto
@@ -41,6 +41,9 @@ index_efrom=תאריך ושעה התחלה לא חוקיים
 index_eto=תאריך ושעת סיום לא חוקיים
 index_err=יצירת הדוח נכשלה
 index_usage=תעבורת רשת <font color=#ff0000>שהורדה</font> ו <font color=#0000ff>הועלה</font>
+index_in=הורד
+index_out=העלה
+index_total=סך הכל
 index_hhour=שעה
 index_hhost=מנחה
 index_hday=יום
--- a/bandwidth/lang/hr.auto
+++ b/bandwidth/lang/hr.auto
@@ -1,3 +1,6 @@
 index_other=Ostali ..
+index_in=preuzimanje datoteka
+index_out=Učitaj
+index_total=Ukupno

 setup_eiface=Nedostaje ili nevaljano ime sučelja
--- a/bandwidth/lang/hu.auto
+++ b/bandwidth/lang/hu.auto
@@ -1,4 +1,7 @@
 index_esyslog=A Rendszernaplók egyikét sem telepíti erre a rendszerre, és az operációs rendszer nem támogatja. A sávszélesség-figyelő modul nem működhet ezek nélkül.
 index_setupdesc2=<b>Figyelem - ez a modul naplózza az összes küldött vagy fogadott hálózati forgalmat a kiválasztott felületen. Ez nagy mennyiségű lemezterületet és CPU-időt fog igénybe venni egy gyors hálózati kapcsolaton.</b>
+index_in=Letöltés
+index_out=Feltöltés
+index_total=Teljes

 setup_eiface=Hiányzó vagy érvénytelen felület neve
--- a/bandwidth/lang/it.auto
+++ b/bandwidth/lang/it.auto
@@ -41,6 +41,9 @@ index_efrom=Data e ora di inizio non valide
 index_eto=Data e ora di fine non valide
 index_err=Generazione del rapporto non riuscita
 index_usage=Traffico di rete <font color=#ff0000>scaricato</font> e <font color=#0000ff>caricato</font>
+index_in=Scarica
+index_out=Caricamento
+index_total=Totale
 index_hhour=Ora
 index_hhost=Ospite
 index_hday=Giorno
--- a/bandwidth/lang/ja.auto
+++ b/bandwidth/lang/ja.auto
@@ -41,6 +41,9 @@ index_efrom=無効な開始日時
 index_eto=無効な終了日時
 index_err=レポートを生成できませんでした
 index_usage=ネットワークトラフィック<font color=＃ff0000>ダウンロード済み</font>および<font color=＃0000ff>アップロード済み</font>
+index_in=ダウンロード
+index_out=アップロード
+index_total=合計
 index_hhour=時
 index_hhost=ホスト
 index_hday=日
--- a/bandwidth/lang/ko.auto
+++ b/bandwidth/lang/ko.auto
@@ -41,6 +41,9 @@ index_efrom=유효하지 않은 시작 날짜 및 시간
 index_eto=유효하지 않은 종료 날짜 및 시간
 index_err=보고서를 생성하지 못했습니다
 index_usage=네트워크 트래픽 <font color=#ff0000>다운로드</font> 및 <font color=#0000ff>업로드</font>
+index_in=다운로드
+index_out=업로드
+index_total=총
 index_hhour=시
 index_hhost=주최자
 index_hday=일
--- a/bandwidth/lang/lt.auto
+++ b/bandwidth/lang/lt.auto
@@ -41,6 +41,9 @@ index_efrom=Netinkama pradžios data ir laikas
 index_eto=Netinkama pabaigos data ir laikas
 index_err=Nepavyko sugeneruoti ataskaitos
 index_usage=Tinklo srautas <font color=#ff0000>atsisiųstas</font> ir <font color=#0000ff>įkeltas</font>
+index_in=parsisiųsti
+index_out=Įkelti
+index_total=Iš viso
 index_hhour=Valanda
 index_hhost=Priimančioji
 index_hday=Diena
--- a/bandwidth/lang/lv.auto
+++ b/bandwidth/lang/lv.auto
@@ -41,6 +41,9 @@ index_efrom=Nederīgs sākuma datums un laiks
 index_eto=Nederīgs beigu datums un laiks
 index_err=Neizdevās ģenerēt pārskatu
 index_usage=Tīkla trafiks <font color=#ff0000>lejupielādēts</font> un <font color=#0000ff>augšupielādēts</font>
+index_in=Lejupielādēt
+index_out=Augšupielādēt
+index_total=Kopā
 index_hhour=Stunda
 index_hhost=Saimnieks
 index_hday=Diena
--- a/bandwidth/lang/ms.auto
+++ b/bandwidth/lang/ms.auto
@@ -0,0 +1,3 @@
+index_in=Muat turun
+index_out=Muat naik
+index_total=Jumlah
--- a/bandwidth/lang/mt.auto
+++ b/bandwidth/lang/mt.auto
@@ -41,6 +41,9 @@ index_efrom=Data u ħin tal-bidu mhux validi
 index_eto=Data u ħin li jispiċċaw mhux validi
 index_err=Naqas milli jiġġenera rapport
 index_usage=It-traffiku tan-netwerk <font color=#ff0000>jitniżżel</font> u <font color=#0000ff>imtella '</font>
+index_in=Niżżel
+index_out=Upload
+index_total=Total
 index_hhour=Siegħa
 index_hhost=Ospitanti
 index_hday=Jum
--- a/bandwidth/lang/nl.auto
+++ b/bandwidth/lang/nl.auto
@@ -0,0 +1,3 @@
+index_in=Downloaden
+index_out=Uploaden
+index_total=Totaal
--- a/bandwidth/lang/no.auto
+++ b/bandwidth/lang/no.auto
@@ -0,0 +1,3 @@
+index_in=nedlasting
+index_out=Laste opp
+index_total=Total
--- a/bandwidth/lang/pl.auto
+++ b/bandwidth/lang/pl.auto
@@ -0,0 +1,3 @@
+index_in=Pobierać
+index_out=Wgrywać
+index_total=Całkowity
--- a/bandwidth/lang/pt.auto
+++ b/bandwidth/lang/pt.auto
@@ -41,6 +41,9 @@ index_efrom=Data e hora de início inválidas
 index_eto=Data e hora de término inválidas
 index_err=Falha ao gerar o relatório
 index_usage=Tráfego de rede <font color=#ff0000>baixado</font> e <font color=#0000ff>carregado</font>
+index_in=Download
+index_out=Carregar
+index_total=Total
 index_hhour=Hora
 index_hhost=Hospedeiro
 index_hday=Dia
--- a/bandwidth/lang/pt_BR.auto
+++ b/bandwidth/lang/pt_BR.auto
@@ -41,6 +41,9 @@ index_efrom=Data e hora de início inválidas
 index_eto=Data e hora de término inválidas
 index_err=Falha ao gerar o relatório
 index_usage=Tráfego de rede <font color=#ff0000>baixado</font> e <font color=#0000ff>carregado</font>
+index_in=Download
+index_out=Carregar
+index_total=Total
 index_hhour=Hora
 index_hhost=Hospedeiro
 index_hday=Dia
--- a/bandwidth/lang/ro.auto
+++ b/bandwidth/lang/ro.auto
@@ -41,6 +41,9 @@ index_efrom=Data și ora de începere nevalide
 index_eto=Data și ora de încheiere nevalide
 index_err=Eroare la generarea raportului
 index_usage=Traficul de rețea <font color=#ff0000>descărcat</font> și <font color=#0000ff>încărcat</font>
+index_in=Descarca
+index_out=Încărcați
+index_total=Total
 index_hhour=Ora
 index_hhost=Gazdă
 index_hday=Zi
--- a/bandwidth/lang/ru.auto
+++ b/bandwidth/lang/ru.auto
@@ -41,6 +41,9 @@ index_efrom=Неверная дата и время начала
 index_eto=Неправильная дата и время окончания
 index_err=Не удалось сгенерировать отчет
 index_usage=Сетевой трафик <font color=#ff0000>загружен</font> и <font color=#0000ff>загружен</font>
+index_in=Скачать
+index_out=Загрузить
+index_total=Общее
 index_hhour=Час
 index_hhost=хозяин
 index_hday=День
--- a/bandwidth/lang/sk.auto
+++ b/bandwidth/lang/sk.auto
@@ -41,6 +41,9 @@ index_efrom=Neplatný dátum a čas začiatku
 index_eto=Neplatný dátum a čas ukončenia
 index_err=Nepodarilo sa vygenerovať prehľad
 index_usage=Sieťový prenos <font color=#ff0000>stiahnutý</font> a <font color=#0000ff>uploaded</font>
+index_in=Stiahnuť ▼
+index_out=Nahrať
+index_total=Celkom
 index_hhour=hodina
 index_hhost=Hostiteľ
 index_hday=deň
--- a/bandwidth/lang/sl.auto
+++ b/bandwidth/lang/sl.auto
@@ -41,6 +41,9 @@ index_efrom=Neveljaven začetni datum in ura
 index_eto=Neveljaven datum in čas zaključka
 index_err=Poročila ni bilo mogoče ustvariti
 index_usage=Omrežni promet <font color=#ff0000>prenesen</font> in <font color=#0000ff>naložen</font>
+index_in=Prenesi
+index_out=Naloži
+index_total=Skupaj
 index_hhour=Ura
 index_hhost=Gostitelj
 index_hday=Dan
--- a/bandwidth/lang/sv.auto
+++ b/bandwidth/lang/sv.auto
@@ -1,4 +1,7 @@
 index_setupdesc2=<b>Varning - den här modulen loggar ALL nätverkstrafik som skickats eller mottagits i det valda gränssnittet. Detta kommer att konsumera en stor mängd diskutrymme och CPU-tid på en snabb nätverksanslutning.</b>
 index_other=Övrig ..
+index_in=Ladda ner
+index_out=Ladda upp
+index_total=Total

 setup_eiface=Saknas eller ogiltigt gränssnittsnamn
--- a/bandwidth/lang/th.auto
+++ b/bandwidth/lang/th.auto
@@ -41,6 +41,9 @@ index_efrom=วันที่และเวลาเริ่มต้นไ
 index_eto=วันที่และเวลาสิ้นสุดไม่ถูกต้อง
 index_err=ไม่สามารถสร้างรายงาน
 index_usage=การรับส่งข้อมูลเครือข่าย <font color=#ff0000>ดาวน์โหลด</font> และ <font color=#0000ff>อัปโหลด</font>
+index_in=ดาวน์โหลด
+index_out=ที่อัพโหลด
+index_total=ทั้งหมด
 index_hhour=ชั่วโมง
 index_hhost=เจ้าภาพ
 index_hday=วัน
--- a/bandwidth/lang/tr.auto
+++ b/bandwidth/lang/tr.auto
@@ -41,6 +41,9 @@ index_efrom=Geçersiz başlangıç tarihi ve saati
 index_eto=Geçersiz bitiş tarihi ve saati
 index_err=Rapor oluşturulamadı
 index_usage=Ağ trafiği <font color=#ff0000>indirildi</font> ve <font color=#0000ff>yüklendi</font>
+index_in=İndirmek
+index_out=Yüklemek
+index_total=Toplam
 index_hhour=Saat
 index_hhost=evsahibi
 index_hday=Gün
--- a/bandwidth/lang/uk.auto
+++ b/bandwidth/lang/uk.auto
@@ -41,6 +41,9 @@ index_efrom=Недійсна дата і час початку
 index_eto=Недійсна дата та час закінчення
 index_err=Не вдалося створити звіт
 index_usage=Мережевий трафік <font color=#ff0000>завантажений</font> та <font color=#0000ff>завантажений</font>
+index_in=Завантажити
+index_out=Завантажити
+index_total=Всього
 index_hhour=Година
 index_hhost=Господар
 index_hday=День
--- a/bandwidth/lang/ur.auto
+++ b/bandwidth/lang/ur.auto
@@ -41,6 +41,9 @@ index_efrom=غلط آغاز اور تاریخ
 index_eto=غلط ختم ہونے کی تاریخ اور وقت
 index_err=رپورٹ تیار کرنے میں ناکام
 index_usage=Network traffic <font color=#ff0000>downloaded</font> and <font color=#0000ff>uploaded</font>
+index_in=ڈاؤن لوڈ کریں
+index_out=اپ لوڈ کریں۔
+index_total=کل
 index_hhour=قیامت
 index_hhost=میزبان
 index_hday=دن
--- a/bandwidth/lang/vi.auto
+++ b/bandwidth/lang/vi.auto
@@ -41,6 +41,9 @@ index_efrom=Ngày và giờ bắt đầu không hợp lệ
 index_eto=Ngày và thời gian kết thúc không hợp lệ
 index_err=Không thể tạo báo cáo
 index_usage=Lưu lượng truy cập mạng <font color=#ff0000>đã tải xuống</font> và <font color=#0000ff>đã tải lên</font>
+index_in=Tải xuống
+index_out=Tải lên
+index_total=Toàn bộ
 index_hhour=Giờ
 index_hhost=Tổ chức
 index_hday=ngày
--- a/bandwidth/lang/zh.auto
+++ b/bandwidth/lang/zh.auto
@@ -41,6 +41,9 @@ index_efrom=无效的开始日期和时间
 index_eto=无效的结束日期和时间
 index_err=未能生成报告
 index_usage=网络流量<font color=＃ff0000>已下载</font>和<font color=＃0000ff>已上传</font>
+index_in=下载
+index_out=上传
+index_total=全部的
 index_hhour=小时
 index_hhost=主办
 index_hday=天
--- a/bandwidth/lang/zh_TW.auto
+++ b/bandwidth/lang/zh_TW.auto
@@ -41,6 +41,9 @@ index_efrom=無效的開始日期和時間
 index_eto=無效的結束日期和時間
 index_err=未能生成報告
 index_usage=網絡流量<font color=＃ff0000>已下載</font>和<font color=＃0000ff>已上傳</font>
+index_in=下載
+index_out=上傳
+index_total=全部的
 index_hhour=小時
 index_hhost=主辦
 index_hday=天
--- a/bin/language-manager
+++ b/bin/language-manager
@@ -1916,4 +1916,4 @@ Verbosely print processed files and provide detailed output. By detault, verbose

 =head1 LICENSE AND COPYRIGHT

-Copyright 2020 Ilia Rostovtsev <programming@rostovtsev.io>
+Copyright 2022 Ilia Rostovtsev <ilia@virtualmin.com>
--- a/bin/webmin
+++ b/bin/webmin
@@ -418,8 +418,8 @@ non-0 on error

 =head1 LICENSE AND COPYRIGHT

-Copyright 2021 
-        Jamie Cameron <jcameron@webmin.com>, 
+Copyright 2022 
+        Jamie Cameron <jamie@virtualmin.com>, 
        Joe Cooper <joe@virtualmin.com>,
-        Ilia Rostovtsev <ilia@rostovtsev.io>.
+        Ilia Rostovtsev <ilia@virtualmin.com>.

--- a/bind8/bind8-lib.pl
+++ b/bind8/bind8-lib.pl
@@ -690,9 +690,9 @@ my ($addr, @vals, $dir);
 my @sp = split(/\s+/, $in{$_[0]});
 for(my $i=0; $i<@sp; $i++) {
 	!$_[3] || &check_ipaddress($sp[$i]) || &error(&text('eip', $sp[$i]));
-	if (lc($sp[$i+1]) eq "key") {
-		push(@vals, { 'name' => $sp[$i++],
-			      'values' => [ "key", $sp[++$i] ] });
+	if (lc($sp[$i]) eq "key") {
+		push(@vals, { 'name' => $sp[$i],
+			      'values' => [ "\"".$sp[++$i]."\"" ] });
 		}
 	else {
 		push(@vals, { 'name' => $sp[$i] });
@@ -1281,6 +1281,14 @@ elsif ($type eq "DMARC") {
 	print &ui_table_row($text{'value_dmarcruf'},
 	    &ui_opt_textbox("dmarcruf", $ruf, 50, $text{'value_dmarcnor'}), 3);

+	print &ui_table_row($text{'value_dmarcrf'},
+		&ui_select("dmarcrf", $dmarc->{'rf'},
+			   [ [ undef, $text{'default'} ],
+			     [ 'afrf', $text{'value_dmarcafrf'} ] ]));
+
+	print &ui_table_row($text{'value_dmarcri'},
+		&ui_textbox("dmarcri", $dmarc->{'ri'}, 5)."s");
+
 	print &ui_table_row($text{'value_dmarcfo'},
 		&ui_select("dmarcfo", $dmarc->{'fo'},
 			   [ [ undef, $text{'default'} ],
@@ -1310,18 +1318,42 @@ elsif ($type eq "NSEC3PARAM") {
 	}
 elsif ($type eq "CAA") {
 	# CAA records have a flag, tag and issuer domain
-	print &ui_table_row($text{'value_CAA0'},
+	print &ui_table_row($text{'value_CAA1'},
 		&ui_yesno_radio("value0", $v[0] || 0));

-	print &ui_table_row($text{'value_CAA1'},
+	print &ui_table_row($text{'value_CAA2'},
 		&ui_select("value1", $v[1],
 			   [ [ "issue", $text{'value_caa_issue'} ],
 			     [ "issuewild", $text{'value_caa_issuewild'} ],
 			     [ "iodef", $text{'value_caa_iodef'} ] ]));

-	print &ui_table_row($text{'value_CAA2'},
+	print &ui_table_row($text{'value_CAA3'},
 		&ui_textbox("value2", $v[2], 40));
 	}
+elsif ($type eq "NAPTR") {
+	# NAPTR records have order, preference, flags, services and regexp
+	print &ui_table_row($text{'value_NAPTR1'},
+		&ui_textbox("value0", $v[0], 5));
+
+	print &ui_table_row($text{'value_NAPTR2'},
+		&ui_textbox("value1", $v[1], 5));
+
+	my %flags = map { $_, 1 } split(//, $v[2]);
+	my @fopts = ("S", "A", "U", "P");
+	print &ui_table_row($text{'value_NAPTR3'},
+		join(" ", map { &ui_checkbox("value2", $_, $text{'value_NAPTR3_'.$_}, $flags{$_})."<br>" } @fopts));
+
+	print &ui_table_row($text{'value_NAPTR4'},
+		&ui_textbox("value3", $v[3], 40), 3);
+
+	print &ui_table_row($text{'value_NAPTR5'},
+		&ui_opt_textbox("value4", $v[4], 50,
+				$text{'value_NAPTR5_def'}), 3);
+
+	print &ui_table_row($text{'value_NAPTR6'},
+		&ui_opt_textbox("value5", $v[5] eq "." ? "" : $v[5], 50,
+				$text{'value_NAPTR6_def'}), 3);
+	}
 else {
 	# All other types just have a text box
 	print &ui_table_row($text{'value_other'},
@@ -2194,17 +2226,13 @@ my ($dom, $view) = @_;
 my ($out, $ex);
 if ($view) {
 	# Reload a zone in a view
-	&try_cmd("freeze ".quotemeta($dom)." IN ".quotemeta($view));
 	$out = &try_cmd("reload ".quotemeta($dom)." IN ".quotemeta($view));
 	$ex = $?;
-	&try_cmd("thaw ".quotemeta($dom)." IN ".quotemeta($view));
 	}
 else {
 	# Just reload one top-level zone
-	&try_cmd("freeze ".quotemeta($dom));
 	$out = &try_cmd("reload ".quotemeta($dom));
 	$ex = $?;
-	&try_cmd("thaw ".quotemeta($dom));
 	}
 if ($out =~ /not found/i) {
 	# Zone is not known to BIND yet - do a total reload
@@ -2809,7 +2837,10 @@ foreach my $slave (@slaves) {
 				      grep { $_ ne $slave } @slaves;
 		}
 	if ($config{'extra_slaves'}) {
-		push(@otherslaves, split(/\s+/, $config{'extra_slaves'}));
+		push(@otherslaves,
+		     grep { $_ ne '' } 
+                          map { &to_ipaddress($_) }
+			      split(/\s+/, $config{'extra_slaves'}));
 		}
 	if ($moreslaves) {
 		push(@otherslaves, @$moreslaves);
@@ -2983,7 +3014,7 @@ $slave_error = $_[0];

 sub get_forward_record_types
 {
-return ("A", "NS", "CNAME", "MX", "HINFO", "TXT", "SPF", "DMARC", "WKS", "RP", "PTR", "LOC", "SRV", "KEY", "TLSA", "SSHFP", "CAA", "NSEC3PARAM", $config{'support_aaaa'} ? ( "AAAA" ) : ( ), @extra_forward);
+return ("A", "NS", "CNAME", "MX", "HINFO", "TXT", "SPF", "DMARC", "WKS", "RP", "PTR", "LOC", "SRV", "KEY", "TLSA", "SSHFP", "CAA", "NAPTR", "NSEC3PARAM", $config{'support_aaaa'} ? ( "AAAA" ) : ( ), @extra_forward);
 }

 sub get_reverse_record_types
@@ -3295,29 +3326,48 @@ else {
 	$zonesize = $size;
 	}

-# Create the zone key
-my $out = &backquote_logged(
-	"cd ".quotemeta($fn)." && ".
-	"$config{'keygen'} -a ".quotemeta($alg)." -b ".quotemeta($zonesize).
-	" -n ZONE $rand_flag $dom 2>&1");
-if ($?) {
-	kill('KILL', $pid) if ($pid);
-	return $out;
-	}
-
-# Create the key signing key, if needed
-if (!$single) {
-	$out = &backquote_logged(
-		"cd ".quotemeta($fn)." && ".
-		"$config{'keygen'} -a ".quotemeta($alg)." -b ".quotemeta($size).
-		" -n ZONE -f KSK $rand_flag $dom 2>&1");
-	kill('KILL', $pid) if ($pid);
-	if ($?) {
-		return $out;
+# Check if there are saved keys, and if so use them
+my @savedkeys = grep { $_->{'saved'} } &get_dnssec_key($z, 1);
+my $out;
+if (@savedkeys) {
+	# Rename back the saved key files
+	foreach my $key (@savedkeys) {
+		foreach my $f ('publicfile', 'privatefile') {
+			if (ref($key) && $key->{$f} && $key->{'saved'}) {
+				my $origfile = $key->{$f};
+				$origfile =~ s/\.saved$//;
+				&rename_file($key->{$f}, $origfile);
+				}
+			}
 		}
 	}
 else {
-	kill('KILL', $pid) if ($pid);
+	# Create the zone key
+	$out = &backquote_logged(
+		"cd ".quotemeta($fn)." && ".
+		"$config{'keygen'} -a ".quotemeta($alg).
+		" -b ".quotemeta($zonesize).
+		" -n ZONE $rand_flag $dom 2>&1");
+	if ($?) {
+		kill('KILL', $pid) if ($pid);
+		return $out;
+		}
+
+	# Create the key signing key, if needed
+	if (!$single) {
+		$out = &backquote_logged(
+			"cd ".quotemeta($fn)." && ".
+			"$config{'keygen'} -a ".quotemeta($alg).
+			" -b ".quotemeta($size).
+			" -n ZONE -f KSK $rand_flag $dom 2>&1");
+		kill('KILL', $pid) if ($pid);
+		if ($?) {
+			return $out;
+			}
+		}
+	else {
+		kill('KILL', $pid) if ($pid);
+		}
 	}

 # Get the new keys
@@ -3333,6 +3383,7 @@ if (!$single) {

 # Add the new DNSKEY record(s) to the zone
 my $chrootfn = &get_zone_file($z);
+$chrootfn || return "Could not work out records file!";
 my @recs = &read_zone_file($chrootfn, $dom);
 for(my $i=$#recs; $i>=0; $i--) {
 	if ($recs[$i]->{'type'} eq 'DNSKEY') {
@@ -3422,20 +3473,27 @@ return "Re-signing failed : $err" if ($err);
 return undef;
 }

-# delete_dnssec_key(&zone|&zone-name)
+# delete_dnssec_key(&zone|&zone-name, [save-key])
 # Deletes the key for a zone, and all DNSSEC records
 sub delete_dnssec_key
 {
-my ($z) = @_;
+my ($z, $savekey) = @_;
 my $fn = &get_zone_file($z);
 $fn || return "Could not work out records file!";
 my $dom = $z->{'members'} ? $z->{'values'}->[0] : $z->{'name'};

 # Remove the key
-my @keys = &get_dnssec_key($z);
+my @keys = &get_dnssec_key($z, 1);
 foreach my $key (@keys) {
 	foreach my $f ('publicfile', 'privatefile') {
-		&unlink_file($key->{$f}) if (ref($key) && $key->{$f});
+		if (ref($key) && $key->{$f}) {
+			if ($savekey && !$key->{'saved'}) {
+				&rename_file($key->{$f}, $key->{$f}.".saved");
+				}
+			else {
+				&unlink_file($key->{$f});
+				}
+			}
 		}
 	}

@@ -3487,7 +3545,7 @@ while($tries++ < 10) {
 	$out = &backquote_logged(
 		"cd ".quotemeta($dir)." && ".
 		"$config{'signzone'} -o ".quotemeta($dom).
-		($alg =~ /^NSEC3/ ? " -3 -" : "").
+		($alg =~ /^(NSEC3|RSASHA256|RSASHA512|ECCGOST|ECDSAP256SHA256|ECDSAP384SHA384)/ ? " -3 - -u" : "").
 		" -f ".quotemeta($signed)." ".
 		quotemeta($chrootfn)." 2>&1");
 	last if (!$?);
@@ -3580,19 +3638,20 @@ if ($keyrec) {
 	}
 }

-# get_dnssec_key(&zone|&zone-name)
+# get_dnssec_key(&zone|&zone-name, [include-saved])
 # Returns a list of hashes containing details of a zone's keys, or an error
 # message. The KSK is always returned first.
 sub get_dnssec_key
 {
-my ($z) = @_;
+my ($z, $saved) = @_;
 my $dir = &get_keys_dir($z);
 my $dom = $z->{'members'} ? $z->{'values'}->[0] : $z->{'name'};
 my %keymap;
 opendir(ZONEDIR, $dir);
 foreach my $f (readdir(ZONEDIR)) {
-	if ($f =~ /^K\Q$dom\E\.\+(\d+)\+(\d+)\.key$/) {
+	if ($f =~ /^K\Q$dom\E\.\+(\d+)\+(\d+)\.key(\.saved)?$/) {
 		# Found the public key file .. read it
+		next if ($3 && !$saved);
 		$keymap{$2} ||= { };
 		my $rv = $keymap{$2};
 		$rv->{'publicfile'} = "$dir/$f";
@@ -3613,9 +3672,11 @@ foreach my $f (readdir(ZONEDIR)) {
 		$rv->{'publictext'} = &read_file_contents("$dir/$f");
 		while($rv->{'publictext'} =~ s/^;.*\r?\n//) { };
 		$rv->{'publictext'} = format_dnssec_public_key($rv->{'publictext'});
+		$rv->{'saved'} = $3 ? 1 : 0;
 		}
-	elsif ($f =~ /^K\Q$dom\E\.\+(\d+)\+(\d+)\.private$/) {
+	elsif ($f =~ /^K\Q$dom\E\.\+(\d+)\+(\d+)\.private(\.saved)?$/) {
 		# Found the private key file
+		next if ($3 && !$saved);
 		$keymap{$2} ||= { };
 		my $rv = $keymap{$2};
 		$rv->{'privatefile'} = "$dir/$f";
@@ -4099,7 +4160,7 @@ sub dt_genkrf
 }


-# dt_delete_dnssec_state()
+# dt_delete_dnssec_state(&zone)
 # Delete all DNSSEC-Tools meta-data for a given zone 
 sub dt_delete_dnssec_state
 {
@@ -4159,6 +4220,11 @@ sub dt_delete_dnssec_state

 		&dt_rollerd_restart(); 
 		&restart_bind();
+	} else {
+		# Just delete the dsset- file
+		my $z_dir = $z_chroot;
+		$z_dir =~ s/\/[^\/]+$//;
+		&unlink_file($z_dir."/dsset-".$dom.".");
 	}

 	return undef;
--- a/bind8/config-AlmaLinux-Linux-6.0-ALL
+++ b/bind8/config-AlmaLinux-Linux-6.0-ALL
@@ -1,7 +1,7 @@
-soa_style=0
+soa_style=1
 named_path=/usr/sbin/named
 named_conf=/etc/named.conf
-show_list=0
+show_list=1
 records_order=0
 start_cmd=service named start
 stop_cmd=service named stop
--- a/Show More
+++ b/Show More