New version bumps

Update CHANGELOG.md
Merge pull request #1823 from webmin/dev/fix-search-in-menu
2026-02-03 14:13:29 +00:00 · 2023-01-19 18:05:24 -08:00 · 2023-01-20 02:57:41 +02:00 · 2023-01-19 16:55:21 -08:00 · 2023-01-20 02:16:40 +02:00 · 2023-01-20 02:11:37 +02:00
1254 changed files with 50883 additions and 4797 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,67 @@
 ## Changelog

+#### 2.013 (January 19, 2023)
+* Fix Authentic theme issue with error handling
+* Fix Framed theme to respect selected mode in left menu
+* Fix search bar in left menu in Framed theme
+
+#### 2.012 (January 18, 2023)
+* Fix to set the correct algorithm when setting up RNDC #1817
+* Fix the loop bug when sourcing other network configs in Debian
+* Fix to include all Debian network config files in backups
+* Fix to stop doing expensive package re-fetch on upgrades
+* Add support for defining hostname for WebSocket connection
+* Add Debian 12 support
+
+#### 2.011 (January 10, 2023)
+* Add ability to set shell character encoding and set `TERM` environmental variable in the new Terminal module
+* Add support for editing network interfaces in include files for Debian systems
+* Add various improvements to the old good Framed Theme
+* Fix to change Gray Framed Theme name to Framed Theme
+* Fix to verify and close WebSocket session, if parent session was closed
+* Fix to remove `RC4` from the list of strong ciphers
+* Fix don't fail LDAP user or group deletion, if they have already been deleted
+* Fix error handling in MySQL/MariaDB Database server module when executing SQL commands
+* Fix adding an extra server attachment field and other bugs in Read User Mail module
+* Fix the link to release notes for Rocky Linux
+* Fix issues with freezing and thawing dynamic reverse zones in BIND DNS Server module
+* Fix bugs for modules granting anonymous access
+* Fix `mailbox_idle_check_interval` option related bugs in Dovecot module [sourceforge.net#5602](https://sourceforge.net/p/webadmin/bugs/5602/)
+* Fix to use correct extension for package file when upgrading Webmin [webmin/authentic-theme#1633](https://github.com/webmin/authentic-theme/issues/1633)
+* Update the Authentic theme to the latest version
+
+#### 2.010 (November 27, 2022)
+* Add a new Terminal module (interactive shell)
+* Add a new `setup-repos.sh` script to setup Webmin repos
+* Add to replace old Gray Theme with Virtualmin Framed Theme
+* Add _systemd_ improvements
+* Add proper support for openSUSE Leap and Tumbleweed
+* Add Linux Lite support
+* Fix connecting to external IPv6 LDAP server
+* Fix self-signed certificate generation
+* Fix setting hostname using `hostnamectl` command on _systemd_ systems
+* Fix to exclude sensors with unknown temperatures
+* Fix for FreeBSD to support Let's Encrypt certificates requests
+* Fix to support attachment filenames with slash in them
+
+#### 2.001 (September 18, 2022)
+* Fix missing origins and action for direct rules in FirewallD module
+* Removed the need for a full restart when updating SSH keys
+* Improved the Javascript for redirects to HTTPS
+
+#### 2.000 (August 21, 2022)
+* Add to enforce HTTP Strict Transport Security (HSTS) policy in SSL enabled mode
+* Add better `http` to `https` redirects when SSL is enabled
+* Add support for installing multiple versions of Webmin on `systemd` systems
+* Add support for AMD CPU thermisters #1714
+* Add better support for Webmin minor (release) versions upgrades
+* Add Webmin and Usermin configuration modules display minor (release) version
+* Add Mint Linux support
+* Add latest Authentic 20.00 [theme update](https://github.com/webmin/authentic-theme/releases/tag/20.00) with number of bug fixes
+* Fix to also restart dependent services (i.e. `fail2ban`) upon `firewalld` restart
+* Fix to preserve service state for Webmin and Usermin upon package upgrades (i.e. don't start stopped)
+* Fix Bind module config incorrectly updated upon Webmin upgrades on CentOS 7
+
 #### 1.999 (August 4, 2022)
 * Fix to allow IPv6 addresses for slaves in BIND module
 * Fix to send `HUP` signal on reload with `systemd`
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ## Contents
 * [Changelog](https://github.com/webmin/webmin/blob/master/CHANGELOG.md)
 * [About](#about)
-* [Installation](#installation)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-stable.png?raw=true" title="Stable Versions">](http://webmin.com/download.html)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-devel.png?raw=true" title="Development Versions">](http://webmin.com/devel.html)
+* [Installation](#installation)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-stable.png?raw=true" title="Stable Versions">](https://webmin.com/download.html)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-devel.png?raw=true" title="Development Versions">](https://webmin.com/devel.html)
 * [Documentation](#documentation)
 * [Development](#development)
 * [License](#license)
@@ -28,11 +28,11 @@ Perl 5.10 or higher.
 ## Installation
 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)) under [latest release assets](https://github.com/webmin/webmin/releases/latest) or from our [download page](http://webmin.com/download.html);
+ 1. By downloading a pre-built package, available for different distributions (CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris and [other](https://www.webmin.com/support.html)) under [latest release assets](https://github.com/webmin/webmin/releases/latest) or from our [download page](https://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-2.000.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_ command, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>
+ 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-2.013.tar.gz), and running [_setup.sh_](https://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](https://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_ command, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>

 ## Documentation
 Complete set of documentation for Webmin and all of its modules can be found at out [Wiki page](https://doxfer.webmin.com/Webmin/Main_Page).
@@ -41,7 +41,7 @@ Complete set of documentation for Webmin and all of its modules can be found at

 ### Lead developer

-* [Jamie Cameron](http://www.webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)
+* [Jamie Cameron](https://www.webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)

 ### Developers
 * [Ilia Rostovtsev](https://github.com/iliajie)
--- a/WebminCore.pm
+++ b/WebminCore.pm
--- a/acl/acl-lib.pl
+++ b/acl/acl-lib.pl
@@ -1959,16 +1959,8 @@ my $miniserv = { };
 my @anon = split(/\s+/, $miniserv->{'anonymous'} || "");
 my ($user, $found) = &get_anonymous_access($path, $miniserv);
 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);
-&unlock_file(&get_miniserv_config_file());
-
-if (!$user) {
+my $auser = grep { $_->{'name'} eq $user } &list_users();
+if (!$auser) {
 	# Create a user if need be
 	$user = "anonymous";
 	my $uinfo = { 'name' => $user,
@@ -1980,16 +1972,23 @@ if (!$user) {
 else {
 	# Make sure the user has the module
 	my ($uinfo) = grep { $_->{'name'} eq $user } &list_users();
-	$uinfo->{'modules'} ||= [];
 	if ($uinfo && &indexof($mod, @{$uinfo->{'modules'}}) < 0) {
+		$uinfo->{'modules'} ||= [];
 		push(@{$uinfo->{'modules'}}, $mod);
 		&modify_user($uinfo->{'name'}, $uinfo);
 		}
 	else {
-		print STDERR "Anonymous access is granted to user $user, but he doesn't exist!\n";
+		print STDERR "Anonymous access attempted to be granted to user $user, but it doesn't exist!\n";
 		}
 	}

+# Grant access to the user and path
+&lock_file(&get_miniserv_config_file());
+push(@anon, "$path=$user");
+$miniserv->{'anonymous'} = join(" ", @anon);
+&put_miniserv_config($miniserv);
+&unlock_file(&get_miniserv_config_file());
+
 &reload_miniserv();
 }

--- a/acl/lang/af.auto
+++ b/acl/lang/af.auto
@@ -354,6 +354,7 @@ sessions_actions=Optrede..
 sessions_all=Alle sessies..
 sessions_logouts=Toon ook afgemelde sessies..
 sessions_state=staat
+sessions_action=Aksies
 sessions_this=Hierdie aanmelding
 sessions_in=Aangemeld
 sessions_out=Uitgeteken
--- a/acl/lang/ar.auto
+++ b/acl/lang/ar.auto
@@ -242,6 +242,7 @@ sessions_actions=أجراءات..
 sessions_all=كل الجلسات..
 sessions_logouts=اعرض أيضًا جلسات تسجيل الخروج..
 sessions_state=حالة
+sessions_action=أجراءات
 sessions_this=هذا تسجيل الدخول
 sessions_in=تسجيل الدخول
 sessions_out=تسجيل الخروج
--- a/acl/lang/be.auto
+++ b/acl/lang/be.auto
@@ -354,6 +354,7 @@ sessions_actions=Дзеянні..
 sessions_all=Усе сеансы..
 sessions_logouts=Таксама паказаць выходныя сесіі.
 sessions_state=Дзярж
+sessions_action=Дзеянні
 sessions_this=Гэта ўваход
 sessions_in=Ўвайшлі ў
 sessions_out=Выйшаў
--- a/acl/lang/bg.auto
+++ b/acl/lang/bg.auto
@@ -11,6 +11,7 @@ save_eunixname=Потребителското име '$1' не е потреби
 sync_modify=Преименувайте съответстващия потребител на Webmin, когато потребител на Unix е преименуван.

 sessions_all=Всички сесии..
+sessions_action=Действия

 sql_nocache0=Кеш връзки към база данни
 sql_nocache1=Отворете нова връзка за всяко търсене
--- a/acl/lang/ca.auto
+++ b/acl/lang/ca.auto
@@ -11,6 +11,7 @@ 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..
+sessions_action=Accions

 sql_nocache0=Connexions de memòria cau a la base de dades
 sql_nocache1=Obriu una connexió nova per a cada cerca
--- a/acl/lang/cs.auto
+++ b/acl/lang/cs.auto
@@ -64,6 +64,7 @@ sessions_actions=Akce..
 sessions_all=Všechny relace..
 sessions_logouts=Zobrazit také odhlášené relace.
 sessions_state=Stát
+sessions_action=Akce
 sessions_this=Toto přihlášení
 sessions_in=Přihlášen
 sessions_out=Odhlásit
--- a/acl/lang/da.auto
+++ b/acl/lang/da.auto
@@ -11,6 +11,7 @@ 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..
+sessions_action=Handlinger

 sql_nocache0=Cache-forbindelser til databasen
 sql_nocache1=Åbn en ny forbindelse til hvert opslag
--- a/acl/lang/de.auto
+++ b/acl/lang/de.auto
@@ -1,6 +1,7 @@
 sync_modify=Benennen Sie den passenden Webmin-Benutzer um, wenn ein Unix-Benutzer umbenannt wird.

 sessions_all=Alle Sitzungen..
+sessions_action=Aktionen

 sql_nocache0=Cache-Verbindungen zur Datenbank
 sql_nocache1=Öffnen Sie für jede Suche eine neue Verbindung
--- a/acl/lang/el.auto
+++ b/acl/lang/el.auto
@@ -11,6 +11,7 @@ save_eunixname=Το όνομα χρήστη '$1' δεν είναι χρήστη
 sync_modify=Μετονομάστε τον αντίστοιχο χρήστη Webmin όταν μετονομάζεται ένας χρήστης Unix.

 sessions_all=Όλες οι συνεδρίες..
+sessions_action=Ενέργειες

 sql_nocache0=Συνδέσεις προσωρινής μνήμης με βάση δεδομένων
 sql_nocache1=Ανοίξτε μια νέα σύνδεση για κάθε αναζήτηση
--- a/acl/lang/es.auto
+++ b/acl/lang/es.auto
@@ -16,6 +16,7 @@ sessions_actions=Comportamiento..
 sessions_all=Todas las sesiones..
 sessions_logouts=Mostrar también sesiones cerradas.
 sessions_state=Estado
+sessions_action=Comportamiento
 sessions_this=Este inicio de sesión
 sessions_in=Conectado
 sessions_out=Desconectado
--- a/acl/lang/eu.auto
+++ b/acl/lang/eu.auto
@@ -60,6 +60,7 @@ sessions_actions=Ekintzak..
 sessions_all=Saio guztiak..
 sessions_logouts=Erakutsi itxitako saioak ere..
 sessions_state=Estatu
+sessions_action=Ekintzak
 sessions_this=Saioa hasiera
 sessions_in=Saioa hasi
 sessions_out=Saioa amaitu
--- a/acl/lang/fa.auto
+++ b/acl/lang/fa.auto
@@ -115,6 +115,7 @@ sessions_actions=اقدامات..
 sessions_all=تمام جلسات..
 sessions_logouts=همچنین جلسات ورود به سیستم را نشان دهید..
 sessions_state=دولت
+sessions_action=اقدامات
 sessions_this=این ورود
 sessions_in=وارد شده
 sessions_out=خارج شد
--- a/acl/lang/fi.auto
+++ b/acl/lang/fi.auto
@@ -354,6 +354,7 @@ sessions_actions=Toiminnot..
 sessions_all=Kaikki istunnot..
 sessions_logouts=Näytä myös kirjautuneet istunnot..
 sessions_state=Osavaltio
+sessions_action=Toiminnot
 sessions_this=Tämä kirjautuminen
 sessions_in=Kirjautunut sisään
 sessions_out=Kirjautunut ulos
--- a/acl/lang/fr.auto
+++ b/acl/lang/fr.auto
@@ -57,6 +57,7 @@ unix_header=Paramètres d'authentification utilisateur Unix
 unix_utable=Utilisateurs Unix autorisés

 sessions_all=Toutes les séances..
+sessions_action=Actions

 udeletes_jerr=Échec de l'ajout d'utilisateurs au groupe

--- a/acl/lang/he.auto
+++ b/acl/lang/he.auto
@@ -354,6 +354,7 @@ sessions_actions=פעולות..
 sessions_all=כל המפגשים..
 sessions_logouts=הראה גם הפעלות לא מחוברות..
 sessions_state=מדינה
+sessions_action=פעולות
 sessions_this=כניסה זו
 sessions_in=מחובר
 sessions_out=התנתק
--- a/acl/lang/hr.auto
+++ b/acl/lang/hr.auto
@@ -65,6 +65,7 @@ sessions_actions=Akcije..
 sessions_all=Sve sesije..
 sessions_logouts=Prikaži i odjavljene sesije..
 sessions_state=država
+sessions_action=Radnje
 sessions_this=Ova prijava
 sessions_in=Prijavljeni
 sessions_out=Odjavljen
--- a/acl/lang/hu.auto
+++ b/acl/lang/hu.auto
@@ -91,6 +91,7 @@ sessions_actions=Hozzászólások..
 sessions_all=Minden ülés..
 sessions_logouts=A kijelentkezett munkamenetek megjelenítése is
 sessions_state=Állapot
+sessions_action=Akciók
 sessions_this=Ez a bejelentkezés
 sessions_in=Bejelentkezve
 sessions_out=Kilépett
--- a/acl/lang/it.auto
+++ b/acl/lang/it.auto
@@ -40,6 +40,7 @@ sessions_actions=Azioni..
 sessions_all=Tutte le sessioni..
 sessions_logouts=Mostra anche sessioni disconnesse.
 sessions_state=Stato
+sessions_action=Azioni
 sessions_this=Questo login
 sessions_in=Connesso
 sessions_out=Disconnesso
--- a/acl/lang/ja.auto
+++ b/acl/lang/ja.auto
@@ -62,6 +62,7 @@ sessions_actions=行動..
 sessions_all=すべてのセッション。
 sessions_logouts=ログアウトしたセッションも表示します。
 sessions_state=状態
+sessions_action=行動
 sessions_this=このログイン
 sessions_in=ログイン済み
 sessions_out=ログアウトしました
--- a/acl/lang/ko.auto
+++ b/acl/lang/ko.auto
@@ -62,6 +62,7 @@ sessions_actions=행위..
 sessions_all=모든 세션..
 sessions_logouts=로그 아웃 된 세션도 표시하십시오.
 sessions_state=상태
+sessions_action=행위
 sessions_this=이 로그인
 sessions_in=로그인
 sessions_out=로그 아웃
--- a/acl/lang/lt.auto
+++ b/acl/lang/lt.auto
@@ -354,6 +354,7 @@ sessions_actions=Veiksmai..
 sessions_all=Visi užsiėmimai..
 sessions_logouts=Taip pat rodyti atsijungusius seansus..
 sessions_state=Valstybė
+sessions_action=Veiksmai
 sessions_this=Šis prisijungimas
 sessions_in=Prisijungęs
 sessions_out=Atsijungęs
--- a/acl/lang/lv.auto
+++ b/acl/lang/lv.auto
@@ -354,6 +354,7 @@ sessions_actions=Darbības..
 sessions_all=Visas sesijas..
 sessions_logouts=Rādīt arī atteikšanās sesijas..
 sessions_state=Valsts
+sessions_action=Darbības
 sessions_this=Šī pieteikšanās
 sessions_in=Pieteicies
 sessions_out=Izlogojies
--- a/acl/lang/ms.auto
+++ b/acl/lang/ms.auto
@@ -16,6 +16,7 @@ sessions_actions=Tindakan..
 sessions_all=Semua sesi..
 sessions_logouts=Juga tunjukkan sesi log keluar..
 sessions_state=Negeri
+sessions_action=Tindakan
 sessions_this=Log masuk ini
 sessions_in=Log masuk
 sessions_out=Logged out
--- a/acl/lang/mt.auto
+++ b/acl/lang/mt.auto
@@ -354,6 +354,7 @@ sessions_actions=Azzjonijiet..
 sessions_all=Is-sessjonijiet kollha..
 sessions_logouts=Uri wkoll sessjonijiet illoggjati..
 sessions_state=Stat
+sessions_action=Azzjonijiet
 sessions_this=Dan id-dħul
 sessions_in=Dħalt
 sessions_out=Dħalt
--- a/acl/lang/nl.auto
+++ b/acl/lang/nl.auto
@@ -39,6 +39,7 @@ sessions_actions=Acties..
 sessions_all=Alle sessies..
 sessions_logouts=Toon ook uitgelogde sessies..
 sessions_state=Staat
+sessions_action=Acties
 sessions_this=Deze login
 sessions_in=Ingelogd
 sessions_out=Uitgelogd
--- a/acl/lang/no.auto
+++ b/acl/lang/no.auto
@@ -1,6 +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..
+sessions_action=Handlinger

 sql_nocache0=Cache-tilkoblinger til databasen
 sql_nocache1=Åpne en ny forbindelse for hvert oppslag
--- a/acl/lang/pl.auto
+++ b/acl/lang/pl.auto
@@ -14,6 +14,7 @@ sessions_actions=Działania..
 sessions_all=Wszystkie sesje...
 sessions_logouts=Pokaż także wylogowane sesje.
 sessions_state=Stan
+sessions_action=działania
 sessions_this=Ten login
 sessions_in=Zalogowany
 sessions_out=Wylogowano
--- a/acl/lang/pt.auto
+++ b/acl/lang/pt.auto
@@ -330,6 +330,7 @@ sessions_actions=Ações..
 sessions_all=Todas as sessões..
 sessions_logouts=Mostrar também sessões desconectadas.
 sessions_state=Estado
+sessions_action=Ações
 sessions_this=Este login
 sessions_in=Logado
 sessions_out=Desconectado
--- a/acl/lang/pt_BR.auto
+++ b/acl/lang/pt_BR.auto
@@ -58,6 +58,7 @@ sessions_actions=Ações..
 sessions_all=Todas as sessões..
 sessions_logouts=Mostrar também sessões desconectadas.
 sessions_state=Estado
+sessions_action=Ações
 sessions_this=Este login
 sessions_in=Logado
 sessions_out=Desconectado
--- a/acl/lang/ro.auto
+++ b/acl/lang/ro.auto
@@ -354,6 +354,7 @@ sessions_actions=Acțiuni..
 sessions_all=Toate sesiunile..
 sessions_logouts=Arată, de asemenea, sesiuni deconectate..
 sessions_state=Stat
+sessions_action=Acțiuni
 sessions_this=Această autentificare
 sessions_in=Conectat
 sessions_out=Delogat
--- a/acl/lang/ru.auto
+++ b/acl/lang/ru.auto
@@ -62,6 +62,7 @@ sessions_actions=Действия..
 sessions_all=Все сеансы..
 sessions_logouts=Также показать сеансы выхода из системы.
 sessions_state=состояние
+sessions_action=Действия
 sessions_this=Этот логин
 sessions_in=Войти в систему
 sessions_out=Вышли из
--- a/acl/lang/sk.auto
+++ b/acl/lang/sk.auto
@@ -107,6 +107,7 @@ sessions_actions=Akcia..
 sessions_all=Všetky relácie..
 sessions_logouts=Zobraziť aj odhlásené relácie.
 sessions_state=Štát
+sessions_action=Akcie
 sessions_this=Toto prihlásenie
 sessions_in=Prihlásený
 sessions_out=Odhlasený
--- a/acl/lang/sl.auto
+++ b/acl/lang/sl.auto
@@ -354,6 +354,7 @@ sessions_actions=Ukrepi..
 sessions_all=Vse seje..
 sessions_logouts=Prikaži tudi odjavne seje.
 sessions_state=Država
+sessions_action=Dejanja
 sessions_this=Ta prijava
 sessions_in=Prijavljeni
 sessions_out=Odjavljeni
--- a/acl/lang/sv.auto
+++ b/acl/lang/sv.auto
@@ -62,6 +62,7 @@ sessions_actions=Handlingar..
 sessions_all=Alla sessioner..
 sessions_logouts=Visa även utloggade sessioner..
 sessions_state=stat
+sessions_action=Åtgärder
 sessions_this=Den här inloggningen
 sessions_in=Inloggad
 sessions_out=Utloggad
--- a/acl/lang/th.auto
+++ b/acl/lang/th.auto
@@ -354,6 +354,7 @@ sessions_actions=การดำเนินการ..
 sessions_all=ทุกวาระ..
 sessions_logouts=แสดงเซสชันการออกจากระบบด้วย..
 sessions_state=สถานะ
+sessions_action=การกระทำ
 sessions_this=เข้าสู่ระบบนี้
 sessions_in=เข้าสู่ระบบ
 sessions_out=ออกจากระบบ
--- a/acl/lang/tr.auto
+++ b/acl/lang/tr.auto
@@ -123,6 +123,7 @@ sessions_actions=Hareketler..
 sessions_all=Tüm oturumlar..
 sessions_logouts=Oturumu kapatılmış oturumları da göster..
 sessions_state=Durum
+sessions_action=Hareketler
 sessions_this=Bu giriş
 sessions_in=Giriş
 sessions_out=Çıkış yapıldı
--- a/acl/lang/uk.auto
+++ b/acl/lang/uk.auto
@@ -349,6 +349,7 @@ sessions_actions=Дії..
 sessions_all=Всі сеанси..
 sessions_logouts=Показати також сеанси виходу з системи..
 sessions_state=Держава
+sessions_action=Дії
 sessions_this=Це логін
 sessions_in=Увійшли в
 sessions_out=Вийшли з системи
--- a/acl/lang/ur.auto
+++ b/acl/lang/ur.auto
@@ -354,6 +354,7 @@ sessions_actions=عمل..
 sessions_all=تمام سیشنز..
 sessions_logouts=لاگ آؤٹ سیشن بھی دکھائیں..
 sessions_state=حالت
+sessions_action=اعمال
 sessions_this=یہ لاگ ان
 sessions_in=لاگ ان
 sessions_out=لاگ آؤٹ
--- a/acl/lang/vi.auto
+++ b/acl/lang/vi.auto
@@ -354,6 +354,7 @@ 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_action=Hành động
 sessions_this=Thông tin đăng nhập này
 sessions_in=Đăng nhập
 sessions_out=Đăng xuất
--- a/acl/lang/zh.auto
+++ b/acl/lang/zh.auto
@@ -163,6 +163,7 @@ sessions_actions=动作..
 sessions_all=所有会议..
 sessions_logouts=同时显示注销的会话。
 sessions_state=州
+sessions_action=行动
 sessions_this=此登录名
 sessions_in=登录
 sessions_out=登出
--- a/acl/lang/zh_TW.auto
+++ b/acl/lang/zh_TW.auto
@@ -141,6 +141,7 @@ sessions_actions=動作..
 sessions_all=所有會議..
 sessions_logouts=還顯示註銷的會話。
 sessions_state=州
+sessions_action=行動
 sessions_this=此登錄名
 sessions_in=登錄
 sessions_out=登出
--- a/apache/config-openSUSE-Linux-15.0-ALL
+++ b/apache/config-openSUSE-Linux-15.0-ALL
@@ -0,0 +1,23 @@
+show_list=0
+httpd_dir=/srv/www
+httpd_conf=/etc/apache2/httpd.conf
+mime_types=/etc/apache2/mime.types
+httpd_path=/usr/sbin/httpd
+start_cmd=systemctl start apache2
+stop_cmd=systemctl stop apache2
+apply_cmd=systemctl restart apache2
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+test_always=0
+test_apachectl=1
+apachectl_path=/usr/sbin/apache2ctl
+virt_file=/etc/apache2/vhosts.d
+pid_file=/run/httpd.pid
+defines_file=/etc/sysconfig/apache2
+defines_name=APACHE_SERVER_FLAGS
+auto_mods=1
+show_names=0
+allow_virtualmin=0
+format_config=1
--- a/at/config-openSUSE-Linux-15.0-ALL
+++ b/at/config-openSUSE-Linux-15.0-ALL
@@ -0,0 +1,4 @@
+at_style=linux
+at_dir=/var/spool/atjobs
+allow_file=/etc/at.allow
+deny_file=/etc/at.deny
--- a/bacula-backup/bacula-backup-lib.pl
+++ b/bacula-backup/bacula-backup-lib.pl
@@ -3,6 +3,7 @@

 BEGIN { push(@INC, ".."); };
 use WebminCore;
+use JSON::PP;
 &init_config();
 use Time::Local;
 if (&foreign_check("node-groups")) {
--- a/bacula-backup/list.cgi
+++ b/bacula-backup/list.cgi
@@ -5,8 +5,6 @@ $trust_unknown_referers = 1;
 require './bacula-backup-lib.pl';
 &ReadParse();

-use JSON::PP;
-
 # Input sanitization
 die "Illegal input" if ($in{'job'} and $in{'job'} !~ /^\d+\z/);

--- a/bin/disable-proxy
+++ b/bin/disable-proxy
@@ -149,6 +149,6 @@ C</etc/webmin>

 =head1 LICENSE AND COPYRIGHT

- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                Joe Cooper <joe@virtualmin.com>

--- a/bin/disable-twofactor
+++ b/bin/disable-twofactor
@@ -114,6 +114,6 @@ Name of the user to disable two-factor authentication for.
 =head1 LICENSE AND COPYRIGHT


- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                Joe Cooper <joe@virtualmin.com>
                Ilia Rostovtsev <ilia@virtualmin.com>
--- a/bin/enable-proxy
+++ b/bin/enable-proxy
@@ -164,5 +164,5 @@ domain.tld)

 =head1 LICENSE AND COPYRIGHT

- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                Joe Cooper <joe@virtualmin.com>
--- a/bin/list-config
+++ b/bin/list-config
@@ -199,5 +199,5 @@ Display the description of the option from the module C<config.info> file, inste

 =head1 LICENSE AND COPYRIGHT

- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                Joe Cooper <joe@virtualmin.com>
--- a/bin/passwd
+++ b/bin/passwd
@@ -258,7 +258,7 @@ Set new user password. Using this option may be unsecure.

 =head1 LICENSE AND COPYRIGHT

- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                Joe Cooper <joe@virtualmin.com>
                Ilia Rostovtsev <ilia@virtualmin.com>

--- a/bin/server
+++ b/bin/server
@@ -172,7 +172,7 @@ sub root

 =head1 LICENSE AND COPYRIGHT

- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                Joe Cooper <joe@virtualmin.com>
                Ilia Rostovtsev <ilia@virtualmin.com>

--- a/bin/set-config
+++ b/bin/set-config
@@ -181,5 +181,5 @@ already exist in the file, and was added)

 =head1 LICENSE AND COPYRIGHT

- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                Joe Cooper <joe@virtualmin.com>
--- a/bin/webmin
+++ b/bin/webmin
@@ -431,7 +431,7 @@ Returns Webmin and other modules and themes versions installed (only those for w

 =head1 LICENSE AND COPYRIGHT

- Copyright 2022 Jamie Cameron <jcameron@webmin.com>
+ Copyright 2018 Jamie Cameron <jcameron@webmin.com>
                Joe Cooper <joe@virtualmin.com>
                Ilia Rostovtsev <ilia@virtualmin.com>

--- a/bind8/backup_config.pl
+++ b/bind8/backup_config.pl
@@ -27,7 +27,7 @@ foreach my $v (@views) {
 push(@zones, &find("zone", $conf));
 foreach my $z (@zones) {
 	my $tv = &find_value("type", $z->{'members'});
-	next if ($tv ne "master" && $tv ne "hint");
+	next if ($tv ne "master" && $tv ne "primary" && $tv ne "hint");
 	my $file = &find_value("file", $z->{'members'});
 	next if (!$file);
 	if (&is_raw_format_records(&make_chroot($file))) {
--- a/bind8/bind8-lib.pl
+++ b/bind8/bind8-lib.pl
@@ -35,7 +35,7 @@ my @extra_reverse = split(/\s+/, $config{'extra_reverse'} || '');
 our %is_extra = map { $_, 1 } (@extra_forward, @extra_reverse);
 our %access = &get_module_acl();
 my $zone_names_cache = "$module_config_directory/zone-names";
-my $zone_names_version = 3;
+my $zone_names_version = 4;
 my @list_zone_names_cache;
 my $slave_error;
 my %lines_count;
@@ -131,7 +131,7 @@ my $file = $_[0] || $config{'named_conf'};
 if (!defined($get_config_parent_cache{$file})) {
 	my $conf = &get_config();
 	if (!defined($lines_count{$file})) {
-		my $lref = &read_file_lines($file);
+		my $lref = &read_file_lines($file, 1);
 		$lines_count{$file} = @$lref;
 		}
 	$get_config_parent_cache{$file} =
@@ -802,7 +802,8 @@ if ($ipv6) {
 		$rev = &net_to_ip6int($addr, 4*($i+1));
 		$rev =~ s/\.$//g;
 		foreach my $z (@zl) {
-			if (lc($z->{'name'}) eq $rev && $z->{'type'} eq 'master') {
+			if (lc($z->{'name'}) eq $rev &&
+			    ($z->{'type'} eq 'master' || $z->{'type'} eq 'primary')) {
 				# found the reverse master domain
 				$revconf = $z;
 				last DOMAIN;
@@ -822,7 +823,7 @@ else {
 			$zname =~ s/^(\d+)\/(\d+)\.//;
 			if ((lc($zname) eq $rev ||
 			     lc($zname) eq "$rev.") &&
-			    $z->{'type'} eq "master") {
+			    ($z->{'type'} eq "master" || $z->{'type'} eq "primary")) {
 				# found the reverse master domain
 				$revconf = $z;
 				last DOMAIN;
@@ -870,7 +871,7 @@ DOMAIN: for(my $i=1; $i<@parts; $i++) {
 		my $typed;
 		if ((lc($z->{'name'}) eq $fwd ||
 		     lc($z->{'name'}) eq "$fwd.") &&
-		    $z->{'type'} eq "master") {
+		    ($z->{'type'} eq "master" || $z->{'type'} eq "primary")) {
 			# Found the forward master!
 			$fwdconf = $z;
 			last DOMAIN;
@@ -981,7 +982,7 @@ sub can_edit_reverse
 return $access{'reverse'} || &can_edit_zone($_[0]);
 }

-# record_input(zone-name, view, type, file, origin, [num], [record],
+# record_input(zone-name, view, type, file, origin, [num], [&record],
 #	       [new-name, new-value])
 # Display a form for editing or creating a DNS record
 sub record_input
@@ -1058,8 +1059,12 @@ else {
 	$ttl = $rec{'ttl'} || '';
 	$ttlunit = "";
 	}
+my $defmsg = $text{'default'};
+if ($rec{'realttl'}) {
+	$defmsg .= " ($rec{'realttl'})";
+	}
 print &ui_table_row($text{'edit_ttl'},
-	&ui_opt_textbox("ttl", $ttl, 8, $text{'default'})." ".
+	&ui_opt_textbox("ttl", $ttl, 8, $defmsg)." ".
 	&time_unit_choice("ttlunit", $ttlunit));

 # Value(s) fields
@@ -2195,7 +2200,7 @@ return undef;
 sub before_editing
 {
 my ($zone) = @_;
-if (!$freeze_zone_count{$zone->{'name'}}) {
+if ($zone->{'dynamic'} && !$freeze_zone_count{$zone->{'name'}}) {
 	my ($out, $ok) = &try_cmd(
 		"freeze ".quotemeta($zone->{'name'})." IN ".
 		quotemeta($zone->{'view'} || ""));
@@ -2225,15 +2230,21 @@ sub restart_zone
 {
 my ($dom, $view) = @_;
 my ($out, $ex);
+my $zone = &get_zone_name($dom, $view);
+my $dyn = $zone && $zone->{'dynamic'};
 if ($view) {
 	# Reload a zone in a view
+	&try_cmd("freeze ".quotemeta($dom)." IN ".quotemeta($view)) if ($dyn);
 	$out = &try_cmd("reload ".quotemeta($dom)." IN ".quotemeta($view));
 	$ex = $?;
+	&try_cmd("thaw ".quotemeta($dom)." IN ".quotemeta($view)) if ($dyn);
 	}
 else {
 	# Just reload one top-level zone
+	&try_cmd("freeze ".quotemeta($dom)) if ($dyn);
 	$out = &try_cmd("reload ".quotemeta($dom));
 	$ex = $?;
+	&try_cmd("thaw ".quotemeta($dom)) if ($dyn);
 	}
 if ($out =~ /not found/i) {
 	# Zone is not known to BIND yet - do a total reload
@@ -2451,9 +2462,13 @@ if ($changed || !$znc{'version'} ||
 		foreach my $z (@vz) {
 			my $type = &find_value("type", $z->{'members'});
 			next if (!$type);
+			$type = lc($type);
 			my $file = &find_value("file", $z->{'members'});
+			my $up = &find("update-policy", $z->{'members'});
+			my $au = &find("allow-update", $z->{'members'});
+			my $dynamic = $up || $au ? 1 : 0;
 			$znc{"zone_".($n++)} = join("\t", $z->{'value'},
-				$z->{'index'}, $type, $v->{'value'}, $file);
+			  $z->{'index'}, $type, $v->{'value'}, $dynamic, $file);
 			$files{$z->{'file'}}++;
 			}
 		$znc{"view_".($n++)} = join("\t", $v->{'value'}, $v->{'index'});
@@ -2462,10 +2477,14 @@ if ($changed || !$znc{'version'} ||
 	foreach my $z (&find("zone", $conf)) {
 		my $type = &find_value("type", $z->{'members'});
 		next if (!$type);
+		$type = lc($type);
 		my $file = &find_value("file", $z->{'members'});
 		$file ||= "";	# slaves and other types with no file
+		my $up = &find("update-policy", $z->{'members'});
+		my $au = &find("allow-update", $z->{'members'});
+		my $dynamic = $up || $au ? 1 : 0;
 		$znc{"zone_".($n++)} = join("\t", $z->{'value'},
-			$z->{'index'}, $type, "*", $file);
+			$z->{'index'}, $type, "*", $dynamic, $file);
 		$files{$z->{'file'}}++;
 		}

@@ -2496,12 +2515,13 @@ if (scalar(@list_zone_names_cache)) {
 my (@rv, %viewidx);
 foreach my $k (keys %znc) {
 	if ($k =~ /^zone_(\d+)$/) {
-		my ($name, $index, $type, $view, $file) =
-			split(/\t+/, $znc{$k}, 5);
+		my ($name, $index, $type, $view, $dynamic, $file) =
+			split(/\t+/, $znc{$k}, 6);
 		push(@rv, { 'name' => $name,
 			    'type' => $type,
 			    'index' => $index,
 			    'view' => !$view || $view eq '*' ? undef : $view,
+			    'dynamic' => $dynamic,
 			    'file' => $file });
 		}
 	elsif ($k =~ /^view_(\d+)$/) {
@@ -2529,7 +2549,7 @@ undef(@list_zone_names_cache);
 unlink($zone_names_cache);
 }

-# get_zone_name(index|name, [viewindex|"any"])
+# get_zone_name(index|name, [viewindex|view-name|"any"])
 # Returns a zone cache object, looked up by name or index
 sub get_zone_name
 {
@@ -2541,7 +2561,8 @@ foreach my $z (@zones) {
 	if ($z->{$field} eq $key &&
 	    ($viewidx eq 'any' ||
 	     $viewidx eq '' && !defined($z->{'viewindex'}) ||
-	     $viewidx ne '' && $z->{'viewindex'} == $_[1])) {
+	     $viewidx =~ /^\d+$/ && $z->{'viewindex'} == $viewidx ||
+	     $viewidx ne '' && $z->{'view'} eq $viewidx)) {
 		return $z;
 		}
 	}
@@ -4304,7 +4325,7 @@ my %cache;
 &read_file($dnssec_expiry_cache, \%cache);
 my $changed = 0;
 foreach my $z (&list_zone_names()) {
-	next if ($z->{'type'} ne 'master');
+	next if ($z->{'type'} ne 'master' && $z->{'type'} ne 'primary');
 	my ($t, $e);
 	if ($cache{$z->{'name'}}) {
 		($t, $e) = split(/\s+/, $cache{$z->{'name'}});
@@ -4382,5 +4403,21 @@ my $kvspace = " " x length("@kvalues");
 return join(" ", @kvalues) . " " . join("\n$kvspace ", splice(@krvalues, 6));
 }

+# redirect_url(type, [zone], [view])
+# Returns the URL of the appropriate edit_*.cgi page
+sub redirect_url
+{
+my ($type, $zone, $view) = @_;
+my $r = $type eq "master" || $type eq "primary" ? "edit_master.cgi" :
+	$type eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi";
+if ($zone) {
+	$r .= "?zone=".&urlize($zone);
+	if ($view) {
+		$r .= "&view=".&urlize($view);
+		}
+	}
+return $r;
+}
+
 1;

--- a/bind8/cgi_args.pl
+++ b/bind8/cgi_args.pl
@@ -33,7 +33,8 @@ elsif ($cgi eq 'edit_text.cgi' || $cgi eq 'edit_soa.cgi' ||
       $cgi eq 'edit_zonekey.cgi' || $cgi eq 'edit_recs.cgi' ||
       $cgi eq 'edit_record.cgi') {
 	# Find a master zone
-	my ($z) = grep { $_->{'type'} eq 'master' &&
+	my ($z) = grep { ($_->{'type'} eq 'master' ||
+			  $_->{'type'} eq 'primary') &&
 			 &can_edit_zone($_) } &list_zone_names();
 	return 'none' if (!$z);
 	my $rv = 'zone='.$z->{'zone'}.
--- a/bind8/conf_net.cgi
+++ b/bind8/conf_net.cgi
@@ -52,7 +52,7 @@ print &ui_table_row($text{'net_listen'}, $ltable, 3);

 # Source address for queries
 my $src = &find("query-source", $mems);
-my $srcstr = join(" ", $src->{'values'});
+my $srcstr = $src ? join(" ", @{$src->{'values'}}) : "";
 my ($sport, $saddr);
 $sport = $1 if ($srcstr =~ /port\s+(\d+)/i);
 $saddr = $1 if ($srcstr =~ /address\s+([0-9\.]+)/i);
--- a/bind8/conf_rndc.cgi
+++ b/bind8/conf_rndc.cgi
@@ -35,7 +35,7 @@ if (!$? && $out !~ /failed/) {
 print &ui_form_start("save_rndc.cgi", "post");
 my $ex = -s $config{'rndc_conf'};
 print &text($ex ? 'rndc_rusure' : 'rndc_rusure2',
-	    "<tt>$config{'rndc_conf'}</tt>"),"<p>\n";
+	    "<tt>$config{'rndc_conf'}</tt>"),"<br>\n";
 print &ui_submit($text{'rndc_ok'});
 print &ui_form_end();

--- a/bind8/config-AlmaLinux-6.0-ALL
+++ b/bind8/config-AlmaLinux-6.0-ALL
@@ -44,10 +44,6 @@ keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
 tmpl_dnssec_dt=1
-dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf
-dnssectools_rollrec=/var/named/system.rollrec
-dnssectools_keydir=/var/named/dtkeys
-dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
--- a/bind8/config-CentOS-Linux-6.0-7.9
+++ b/bind8/config-CentOS-Linux-6.0-7.9
@@ -47,10 +47,6 @@ keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
 tmpl_dnssec_dt=1
-dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf
-dnssectools_rollrec=/var/named/system.rollrec
-dnssectools_keydir=/var/named/dtkeys
-dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
--- a/bind8/config-CentOS-Stream-Linux-8.0-ALL
+++ b/bind8/config-CentOS-Stream-Linux-8.0-ALL
@@ -44,10 +44,6 @@ keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
 tmpl_dnssec_dt=1
-dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf
-dnssectools_rollrec=/var/named/system.rollrec
-dnssectools_keydir=/var/named/dtkeys
-dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
--- a/bind8/config-Oracle-Linux-8.0-ALL
+++ b/bind8/config-Oracle-Linux-8.0-ALL
@@ -44,10 +44,6 @@ keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
 tmpl_dnssec_dt=1
-dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf
-dnssectools_rollrec=/var/named/system.rollrec
-dnssectools_keydir=/var/named/dtkeys
-dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
--- a/bind8/config-Redhat-Enterprise-Linux-6.0-7.9
+++ b/bind8/config-Redhat-Enterprise-Linux-6.0-7.9
@@ -47,10 +47,6 @@ keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
 tmpl_dnssec_dt=1
-dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf
-dnssectools_rollrec=/var/named/system.rollrec
-dnssectools_keydir=/var/named/dtkeys
-dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
--- a/bind8/config-Rocky-Linux-6.0-ALL
+++ b/bind8/config-Rocky-Linux-6.0-ALL
@@ -44,10 +44,6 @@ keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
 tmpl_dnssec_dt=1
-dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf
-dnssectools_rollrec=/var/named/system.rollrec
-dnssectools_keydir=/var/named/dtkeys
-dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
--- a/bind8/config-openSUSE-Linux-15.0-ALL
+++ b/bind8/config-openSUSE-Linux-15.0-ALL
@@ -0,0 +1,50 @@
+soa_style=1
+named_path=/usr/sbin/named
+named_conf=/etc/named.conf
+show_list=1
+records_order=0
+max_zones=50
+rev_def=0
+support_aaaa=1
+allow_comments=0
+allow_wild=1
+allow_long=0
+master_ttl=1
+whois_cmd=whois
+short_names=0
+updserial_def=0
+updserial_on=1
+updserial_man=1
+ndc_cmd=ndc
+forwardzonefilename_format=ZONE.hosts
+reversezonefilename_format=ZONE.rev
+start_cmd=systemctl start named
+restart_cmd=systemctl reload named
+stop_cmd=systemctl stop named
+pid_file=/var/run/named/named.pid
+chroot=
+rev_must=0
+ipv6_mode=1
+allow_underscore=1
+by_view=0
+confirm_zone=1
+confirm_rec=0
+no_chroot=1
+relative_paths=0
+rndc_cmd=rndc
+auto_chroot=
+no_pid_chroot=0
+soa_start=0
+rndc_conf=/etc/rndc.conf
+rndcconf_cmd=rndc-confgen
+largezones=0
+slave_dir=/var/lib/named/slave
+master_dir=/var/lib/named/master
+checkzone=named-checkzone
+keygen=dnssec-keygen
+signzone=dnssec-signzone
+checkconf=named-checkconf
+other_slaves=1
+force_random=0
+spf_record=0
+dnssec_info=1
--- a/bind8/config-redhat-linux-ALL-6.0
+++ b/bind8/config-redhat-linux-ALL-6.0
@@ -47,10 +47,6 @@ keygen=dnssec-keygen
 tmpl_dnssec=0
 dnssec_period=21
 tmpl_dnssec_dt=1
-dnssectools_conf=/etc/dnssec-tools/dnssec-tools.conf
-dnssectools_rollrec=/var/named/system.rollrec
-dnssectools_keydir=/var/named/dtkeys
-dnssectools_rollmgr_pidfile=/var/run/rollmgr.pid
 force_random=0
 spf_record=0
 dnssec_info=1
--- a/bind8/delete_zone.cgi
+++ b/bind8/delete_zone.cgi
@@ -25,6 +25,7 @@ $access{'delete'} || &error($text{'master_edeletecannot'});
 my $rev = ($zconf->{'value'} =~ /in-addr\.arpa/i ||
 	$zconf->{'value'} =~ /\.$ipv6revzone/i);
 my $type = &find("type", $zconf->{'members'})->{'value'};
+$type = 'master' if ($type eq 'primary');
 if (!$in{'confirm'} && $config{'confirm_zone'}) {
 	# Ask the user if he is sure ..
 	&ui_print_header(undef, $text{'delete_title'}, "",
--- a/bind8/disable_zonekey.cgi
+++ b/bind8/disable_zonekey.cgi
@@ -24,7 +24,7 @@ if ($key) {
 foreach my $k (@keyfiles) {
 	&lock_file($k);
 	}
-&delete_dnssec_key($zone, 1);
+&delete_dnssec_key($zone, $in{'keep'});
 foreach my $k (@keyfiles) {
 	&unlock_file($k);
 	}
--- a/bind8/edit_recs.cgi
+++ b/bind8/edit_recs.cgi
@@ -22,6 +22,7 @@ my $typedesc = $text{"recs_$in{'type'}"} || $in{'type'};

 # Show form for adding a record
 my $type = $zone->{'type'};
+$type = 'master' if ($type eq 'primary');
 my $file = $zone->{'file'};
 my $form = 0;
 my $shown_create_form;
@@ -182,14 +183,15 @@ for(my $i=0; $i<@_; $i++) {
 	if ($in{'type'} eq 'ALL') {
 		push(@cols, $r->{'type'});
 		}
-	if ($r->{'ttl'} && $r->{'ttl'} =~ /(\d+)([SMHDW]?)/i) {
-		$r->{'ttl'} =~ s/S//i;
-		if ($r->{'ttl'} =~ s/M//i) { $r->{'ttl'} *= 60; }
-		if ($r->{'ttl'} =~ s/H//i) { $r->{'ttl'} *= 3600; }
-		if ($r->{'ttl'} =~ s/D//i) { $r->{'ttl'} *= 86400; }
-		if ($r->{'ttl'} =~ s/W//i) { $r->{'ttl'} *= 604800; }
+	my $ttl = $r->{'realttl'};
+	if ($ttl && $ttl =~ /(\d+)([SMHDW]?)/i) {
+		$ttl =~ s/S//i;
+		if ($ttl =~ s/M//i) { $ttl *= 60; }
+		if ($ttl =~ s/H//i) { $ttl *= 3600; }
+		if ($ttl =~ s/D//i) { $ttl *= 86400; }
+		if ($ttl =~ s/W//i) { $ttl *= 604800; }
 		}
-	push(@cols, $r->{'ttl'} ? &html_escape($r->{'ttl'}) : $text{'default'});
+	push(@cols, $ttl ? &html_escape($ttl) : $text{'default'});
 	for(my $j=0; $j<@hmap; $j++) {
 		my $v;
 		if ($in{'type'} eq "RP" && $j == 0) {
--- a/bind8/edit_text.cgi
+++ b/bind8/edit_text.cgi
@@ -34,6 +34,5 @@ print &ui_table_row(undef, &ui_checkbox("soa", $config{'updserial_on'},
 print &ui_table_end();
 print &ui_form_end($access{'ro'} ? [ ] : [ [ undef, $text{'save'} ] ]);

-&ui_print_footer(($tv eq "master" ? "edit_master.cgi" :
-	 $tv eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi").
-	"?zone=$in{'zone'}&view=$in{'view'}", $text{'master_return'});
+&ui_print_footer(&redirect_url($tv, $in{'zone'}, $in{'view'}),
+		 $text{'master_return'});
--- a/bind8/edit_zonekey.cgi
+++ b/bind8/edit_zonekey.cgi
@@ -75,7 +75,8 @@ if (@keyrecs) {
 	print &ui_hr();
 	print &ui_buttons_start();
 	print &ui_buttons_row("disable_zonekey.cgi", $text{'zonekey_disable'},
-			      $text{'zonekey_disabledesc'},
+			      $text{'zonekey_disabledesc'}."<br>\n".
+			      &ui_checkbox("keep", 1, $text{'zonekey_keep'}, 1),
 			      &ui_hidden("view", $in{'view'}).
 			      &ui_hidden("zone", $in{'zone'}));

--- a/bind8/free_chooser.cgi
+++ b/bind8/free_chooser.cgi
@@ -23,7 +23,7 @@ my %taken;
 my %nets;
 foreach my $z (@zones) {
 	my $type = &find_value("type", $z->{'members'});
-	next if ($type ne "master");
+	next if ($type ne "master" && $type ne "primary");
 	my $file = &find_value("file", $z->{'members'});
 	my @recs = &read_zone_file($file, $z->{'value'});
 	foreach my $r (@recs) {
--- a/bind8/freeze_zone.cgi
+++ b/bind8/freeze_zone.cgi
@@ -29,9 +29,5 @@ if ($? || $out =~ /failed|not found|error/i) {
 	&error(&text('restart_endc', "<tt>$out</tt>"));
 	}
 &webmin_log("freeze", $dom);
-
-my $tv = $zone->{'type'};
-&redirect(($tv eq "master" ? "edit_master.cgi" :
-	  $tv eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi").
-	  "?zone=$in{'zone'}&view=$in{'view'}");
+&redirect(&redirect_url($zone->{'type'}, $in{'zone'}, $in{'view'}));

--- a/bind8/index.cgi
+++ b/bind8/index.cgi
@@ -187,6 +187,7 @@ elsif (@zones && (!@views || !$config{'by_view'})) {
 		my $t = $z->{'type'};
 		next if (!$t);
 		$t = "delegation" if ($t eq "delegation-only");
+		$t = "master" if ($t eq "primary");
 		my $zn = $v eq "." ? "<i>$text{'index_root'}</i>"
 				      : &ip6int_to_net(&arpa_to_ip($v));
 		if ($z->{'view'}) {
@@ -350,6 +351,8 @@ elsif (@zones) {
 		foreach my $z (@zv) {
 			my $v = $z->{'name'};
 			my $t = $z->{'type'};
+			$t = "delegation" if ($t eq "delegation-only");
+			$t = "master" if ($t eq "primary");
 			my $zn = $v eq "." ? "<i>$text{'index_root'}</i>"
 					      : &ip6int_to_net(&arpa_to_ip($v));
 			push(@zlinks, "edit_$t.cgi?zone=$z->{'name'}".
--- a/bind8/lang/en
+++ b/bind8/lang/en
@@ -1282,6 +1282,7 @@ zonekey_expandzone=Show public and private zone-key details ..
 zonekey_noprivate=However, Webmin could not find the private key associated with the zone, and so will not be able to re-sign it.
 zonekey_eprivate=The private key associated with this zone could not be read : $1
 zonekey_disable=Remove Key
+zonekey_keep=Keep existing key if DNSSEC is re-enabled?
 zonekey_disabledesc=Removes the DNSSEC key from this zone, and all signing records. Once this is done, you will be able to generate a new key.
 zonekey_sign=Sign Zone
 zonekey_signdesc=Immediately re-sign this zone, so that any changes to records made manually will be included in the signing records.
--- a/bind8/list_slaves.cgi
+++ b/bind8/list_slaves.cgi
@@ -46,9 +46,10 @@ if (@servers) {
 	print &ui_columns_end();
 	print &ui_links_row(\@links);
 	print &ui_form_end([ [ "delete", $text{'slaves_delete'} ] ]);
+	print "<p>";
 	}
 else {
-	print "<b>$text{'slaves_none'}</b><p>\n";
+	print "<p>$text{'slaves_none'}</p>\n";
 	}

 # Get all Webmin servers and groups
@@ -108,7 +109,7 @@ if (@addservers || @groups) {
 	print &ui_form_end([ [ undef, $text{'slaves_ok'} ] ]);
 	}
 else {
-	print "<b>",&text('slaves_need', '../servers/'),"</b><p>\n";
+	print "<p>",&text('slaves_need', '../servers/'),"</p>\n";
 	}

 &ui_print_footer("", $text{'index_return'});
--- a/bind8/mass_rcreate.cgi
+++ b/bind8/mass_rcreate.cgi
@@ -62,7 +62,7 @@ $in{'ttl_def'} || $in{'ttl'} =~ /^\d+$/ ||

 foreach my $zi (@zones) {
 	print &text('rmass_doing', "<tt>$zi->{'name'}</tt>"),"<br>\n";
-	if ($zi->{'type'} ne 'master') {
+	if ($zi->{'type'} ne 'master' && $zi->{'type'} ne 'primary') {
 		# Skip - not a master zone
 		print $text{'umass_notmaster'},"<p>\n";
 		next;
--- a/bind8/mass_rdelete.cgi
+++ b/bind8/mass_rdelete.cgi
@@ -28,7 +28,7 @@ $in{'name_def'} || $in{'name'} || &error($text{'rdmass_ename'});

 foreach my $zi (@zones) {
 	print &text('rdmass_doing', "<tt>$zi->{'name'}</tt>"),"<br>\n";
-	if ($zi->{'type'} ne 'master') {
+	if ($zi->{'type'} ne 'master' && $zi->{'type'} ne 'primary') {
 		# Skip - not a master zone
 		print $text{'umass_notmaster'},"<p>\n";
 		next;
--- a/bind8/mass_update.cgi
+++ b/bind8/mass_update.cgi
@@ -63,7 +63,7 @@ elsif ($in{'type'} eq 'ttl') {

 foreach my $zi (@zones) {
 	print &text('umass_doing', "<tt>$zi->{'name'}</tt>"),"<br>\n";
-	if ($zi->{'type'} ne 'master') {
+	if ($zi->{'type'} ne 'master' && $zi->{'type'} ne 'primary') {
 		# Skip - not a master zone
 		print $text{'umass_notmaster'},"<p>\n";
 		next;
--- a/bind8/records-lib.pl
+++ b/bind8/records-lib.pl
@@ -120,7 +120,9 @@ while($line = <$FILE>) {
 close($FILE);

 # parse into data structures
-my $i = 0; my $num = 0;
+my $i = 0;
+my $num = 0;
+my $currttl = undef;
 while($i < @tok) {
 	if ($tok[$i] =~ /^\$origin$/i) {
 		# $ORIGIN directive (may be relative or absolute)
@@ -179,6 +181,7 @@ while($i < @tok) {
 		       	       'defttl' => $tok[$i++],
 			       'type' => '' };
 		push(@rv, $defttl);
+		$currttl = $defttl->{'defttl'};
 		}
 	elsif ($tok[$i] =~ /^\$(\S+)/i) {
 		# some other special directive
@@ -279,6 +282,7 @@ while($i < @tok) {
 			}
 		$dir{'values'} = \@values;
 		$dir{'eline'} = $lnum[$i-1];
+		$dir{'realttl'} = $dir{'ttl'} || $currttl;

 		# Work out canonical form, and maybe use it
 		my $canon = $dir{'name'};
--- a/bind8/resign.pl
+++ b/bind8/resign.pl
@@ -25,7 +25,7 @@ my $errcount = 0;
 my $donecount = 0;
 foreach my $z (@zones) {
 	# Get the key
-	next if ($z->{'type'} ne 'master');
+	next if ($z->{'type'} ne 'master' && $z->{'type'} ne 'primary');
 	my $zonefile = &get_zone_file($z);
 	my $krfile = "$zonefile".".krf";	
 	my $dom = $z->{'members'} ? $z->{'values'}->[0] : $z->{'name'};
--- a/bind8/restart.cgi
+++ b/bind8/restart.cgi
@@ -28,14 +28,6 @@ if ($access{'remote'}) {
 	}

 &webmin_log("apply");
-my $redir_targ = ($in{'type'} eq "master" ? "edit_master.cgi" :
-		  $in{'type'} eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi");
-my $zone;
-if ($in{'zone'}) {
-	$zone = "?zone=$in{'zone'}";
-	if ($in{'view'}) {
-		$zone .= "&view=$in{'view'}";
-		}
-	}
-&redirect($zone && $in{'return'} ? "$redir_targ$zone" : "");
+&redirect($in{'zone'} && $in{'return'} ?
+	  &redirect_url($in{'type'}, $in{'zone'}, $in{'view'}) : "");

--- a/bind8/restart_zone.cgi
+++ b/bind8/restart_zone.cgi
@@ -17,7 +17,4 @@ my $err = &restart_zone($zone->{'name'}, $zone->{'view'});
 &error($err) if ($err);
 &webmin_log("apply", $zone->{'name'});

-my $tv = $zone->{'type'};
-my $redir_targ = ($tv eq "master" ? "edit_master.cgi" :
-		  $tv eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi");
-&redirect($redir_targ . "?zone=$in{'zone'}&view=$in{'view'}");
+&redirect(&redirect_url($zone->{'type'}, $in{'zone'}, $in{'view'}));
--- a/bind8/save_record.cgi
+++ b/bind8/save_record.cgi
@@ -76,12 +76,14 @@ if ($in{'delete'}) {
 		    ($in{'type'} eq "A" ||
 		     $in{'type'} eq "AAAA" &&
 		     &expandall_ip6($in{'oldvalue0'}) eq &expandall_ip6(&ip6int_to_net($orevrec->{'name'})))) {
+			&before_editing($orevconf);
 			&lock_file(&make_chroot($orevrec->{'file'}));
 			&delete_record($orevrec->{'file'} , $orevrec);
 			&lock_file(&make_chroot($orevfile));
 			my @orrecs = &read_zone_file($orevfile, $orevconf->{'name'});
 			&bump_soa_record($orevfile, \@orrecs);
 			&sign_dnssec_zone_if_key($orevconf, \@orrecs);
+			&after_editing($orevconf);
 			}

 		# Update forward
@@ -92,12 +94,14 @@ if ($in{'delete'}) {
 		    (!$ipv6 && &arpa_to_ip($in{'oldname'}) eq $ofwdrec->{'values'}->[0] ||
 		     $ipv6 && &expandall_ip6(&ip6int_to_net($in{'oldname'})) eq &expandall_ip6($ofwdrec->{'values'}->[0])) &&
 		    $fulloldvalue0 eq $ofwdrec->{'name'}) {
+			&before_editing($ofwdconf);
 			&lock_file(&make_chroot($ofwdrec->{'file'}));
 			&delete_record($ofwdrec->{'file'}, $ofwdrec);
 			&lock_file(&make_chroot($ofwdfile));
 			my @ofrecs = &read_zone_file($ofwdfile, $ofwdconf->{'name'});
 			&bump_soa_record($ofwdfile, \@ofrecs);
 			&sign_dnssec_zone_if_key($ofwdconf, \@ofrecs);
+			&after_editing($ofwdconf);
 			}

 		&redirect("edit_recs.cgi?zone=$in{'zone'}&view=$in{'view'}&type=$in{'redirtype'}&sort=$in{'sort'}");
@@ -158,7 +162,8 @@ else {
 			# Is this address already in use? Search all domains
 			# to find out..
 			foreach my $z (@zl) {
-				next if ($z->{'type'} ne "master");
+				next if ($z->{'type'} ne "master" &&
+					 $z->{'type'} ne "primary");
 				next if ($z->{'name'} =~ /in-addr\.arpa/i);
 				my $file = $z->{'file'};
 				my @frecs = &read_zone_file($file, $z->{'name'});
@@ -180,7 +185,8 @@ else {
 			# Is this address already in use? Search all domains
 			# to find out..
 			foreach my $z (@zl) {
-				next if ($z->{'type'} ne "master");
+				next if ($z->{'type'} ne "master" &&
+					 $z->{'type'} ne "primary");
 				next if ($z->{'name'} =~ /\.$ipv6revzone/i);
 				my $file = $z->{'file'};
 				my @frecs = &read_zone_file($file, $z->{'name'});
@@ -601,6 +607,8 @@ else {
 		# Updating the reverse record. Either the name, address
 		# or both may have changed. Furthermore, the reverse record
 		# may now be in a different file!
+		&before_editing($orevconf);
+		&before_editing($revconf);
 		&lock_file(&make_chroot($orevfile));
 		&lock_file(&make_chroot($revfile));
 		my @orrecs = &read_zone_file($orevfile, $orevconf->{'name'});
@@ -632,17 +640,21 @@ else {
 			&bump_soa_record($orevfile, \@orrecs);
 			&sign_dnssec_zone_if_key($orevconf, \@orrecs);
 			}
+		&after_editing($revconf);
+		&after_editing($orevconf);
 		}
 	elsif ($in{'rev'} && !$orevrec && $revconf && !$revrec && 
 	       &can_edit_reverse($revconf)) {
 		# we don't handle the old reverse domain but handle the new 
 		# one.. create a new reverse record
+		&before_editing($revconf);
 	 	&lock_file(&make_chroot($revfile));
 		my @rrecs = &read_zone_file($revfile, $revconf->{'name'});
 		&create_record($revfile, $rname,
 			       $ttl, "IN", "PTR", $fullname, $in{'comment'});
 		&bump_soa_record($revfile, \@rrecs);
 		&sign_dnssec_zone_if_key($revconf, \@rrecs);
+		&after_editing($revconf);
 		}

 	my $ipv6;
@@ -654,6 +666,8 @@ else {
 	    &expandall_ip6($ofwdrec->{'values'}->[0]) &&
 	    $fulloldvalue0 eq $ofwdrec->{'name'}) {
 		# Updating the forward record
+		&before_editing($ofwdfile);
+		&before_editing($fwdfile);
 		&lock_file(&make_chroot($ofwdfile));
 		&lock_file(&make_chroot($fwdfile));
 		my @ofrecs = &read_zone_file($ofwdfile, $ofwdconf->{'name'});
@@ -688,6 +702,8 @@ else {
 			&bump_soa_record($ofwdfile, \@ofrecs);
 			&sign_dnssec_zone_if_key($ofwdconf, \@ofrecs);
 			}
+		&after_editing($fwdfile);
+		&after_editing($ofwdfile);
 		}
 	}
 &bump_soa_record($in{'file'}, \@recs);
--- a/bind8/save_rndc.cgi
+++ b/bind8/save_rndc.cgi
@@ -35,7 +35,8 @@ if ($options) {
 	$port = &find_value("default-port", $options->{'members'});
 	}
 $port ||= 953;
-my $algorithm = &find("algorithm", $rconf);
+my $algorithm = &find_value("algorithm", $rkey->{'members'}) ||
+		&find_value("algorithm", $rconf);
 $algorithm ||= "hmac-md5";

 # Add the key to named.conf
--- a/bind8/slave_add.cgi
+++ b/bind8/slave_add.cgi
@@ -60,7 +60,7 @@ foreach my $v (@views) {
 	}
 foreach my $z (@zoneconfs) {
 	my $type = &find_value("type", $z->{'members'});
-	if ($type eq "master") {
+	if ($type eq "master" || $type eq "primary") {
 		$zmap{$z->{'value'}} = $z;
 		}
 	}
@@ -88,18 +88,6 @@ foreach my $s (@add) {
 		next;
 		}

-	# Check for needed Webmin versions
-	my $rver = &remote_foreign_call($s, "bind8", "get_webmin_version");
-	if ($rver < 1.202) {
-		print &text('add_eversion', $s->{'host'}, 1.202),"<p>\n";
-		next;
-		}
-	if ($s->{'bind8_view'} && $s->{'bind8_view'} =~ /\s/ &&
-	    $rver < 1.422) {
-		print &text('add_eversion2', $s->{'host'}, 1.422),"<p>\n";
-		next;
-		}
-
 	# Check for non-IP name
 	if (&check_ipaddress($s->{'host'}) && $in{'name_def'}) {
 		print &text('add_eipaddr', $s->{'host'}),"<p>\n";
--- a/bind8/start.cgi
+++ b/bind8/start.cgi
@@ -14,14 +14,6 @@ $access{'apply'} || &error($text{'start_ecannot'});
 my $err = &start_bind();
 &error($err) if ($err);
 &webmin_log("start");
-my $redir_targ = ($in{'type'} eq "master" ? "edit_master.cgi" :
-		  $in{'type'} eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi");
-my $zone;
-if ($in{'zone'}) {
-	$zone = "?zone=$in{'zone'}";
-	if ($in{'view'}) {
-		$zone .= "&view=$in{'view'}";
-		}
-	}
-&redirect($zone && $in{'return'} ? "$redir_targ$zone" : "");
+&redirect($in{'zone'} && $in{'return'} ?
+	  &redirect_url($in{'type'}, $in{'zone'}, $in{'view'}) : "");

--- a/bind8/stop.cgi
+++ b/bind8/stop.cgi
@@ -8,14 +8,6 @@ $access{'apply'} || &error($text{'stop_ecannot'});
 $err = &stop_bind();
 &error($err) if ($err);
 &webmin_log("stop");
-my $redir_targ = ($in{'type'} eq "master" ? "edit_master.cgi" :
-		  $in{'type'} eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi");
-my $zone;
-if ($in{'zone'}) {
-	$zone = "?zone=$in{'zone'}";
-	if ($in{'view'}) {
-		$zone .= "&view=$in{'view'}";
-		}
-	}
-&redirect($zone && $in{'return'} ? "$redir_targ$zone" : "");
+&redirect($in{'zone'} && $in{'return'} ?
+	  &redirect_url($in{'type'}, $in{'zone'}, $in{'view'}) : "");

--- a/bind8/unfreeze_zone.cgi
+++ b/bind8/unfreeze_zone.cgi
@@ -30,8 +30,4 @@ if ($? || $out =~ /failed|not found|error/i) {
 	}
 &webmin_log("thaw", $dom);

-my $tv = $zone->{'type'};
-&redirect(($tv eq "master" ? "edit_master.cgi" :
-	  $tv eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi").
-	  "?zone=$in{'zone'}&view=$in{'view'}");
-
+&redirect(&redirect_url($zone->{'type'}, $in{'zone'}, $in{'view'}));
--- a/bind8/view_text.cgi
+++ b/bind8/view_text.cgi
@@ -36,6 +36,5 @@ else {
 		}
 	}

-&ui_print_footer(($tv eq "master" ? "edit_master.cgi" :
-	 $tv eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi").
-	"?zone=$in{'zone'}&view=$in{'view'}", $text{'master_return'});
+&ui_print_footer(&redirect_url($tv, $in{'zone'}, $in{'view'}),
+		 $text{'master_return'});
--- a/bind8/whois.cgi
+++ b/bind8/whois.cgi
@@ -34,7 +34,5 @@ print &ui_table_start(&text('whois_header', "<tt>".&html_escape($pcmd)."</tt>"),
 print &ui_table_row(undef, "<pre>".&html_escape($out)."</pre>", 2);
 print &ui_table_end();

-&ui_print_footer(($tv eq "master" ? "edit_master.cgi" :
-	 $tv eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi").
-	"?zone=$in{'zone'}&view=$in{'view'}", $text{'master_return'});
-
+&ui_print_footer(&redirect_url($tv, $in{'zone'}, $in{'view'}),
+		 $text{'master_return'});
--- a/burner/acl_security.pl
+++ b/burner/acl_security.pl
@@ -5,58 +5,39 @@ do 'burner-lib.pl';
 # Output HTML for editing security options for the acl module
 sub acl_security_form
 {
-print "<tr> <td><b>$text{'acl_create'}</b></td> <td>\n";
-printf "<input type=radio name=create value=1 %s> $text{'yes'}\n",
-	$_[0]->{'create'} ? 'checked' : '';
-printf "<input type=radio name=create value=0 %s> $text{'no'}</td>\n",
-	$_[0]->{'create'} ? '' : 'checked';
+my ($o) = @_;
+print &ui_table_row($text{'acl_create'},
+	&ui_yesno_radio("create", $o->{'create'}));

-print "<td><b>$text{'acl_edit'}</b></td> <td>\n";
-printf "<input type=radio name=edit value=1 %s> $text{'yes'}\n",
-	$_[0]->{'edit'} ? 'checked' : '';
-printf "<input type=radio name=edit value=0 %s> $text{'no'}</td> </tr>\n",
-	$_[0]->{'edit'} ? '' : 'checked';
+print &ui_table_row($text{'acl_edit'},
+	&ui_yesno_radio("edit", $o->{'edit'}));

-print "<tr> <td><b>$text{'acl_global'}</b></td> <td>\n";
-printf "<input type=radio name=global value=1 %s> $text{'yes'}\n",
-	$_[0]->{'global'} ? 'checked' : '';
-printf "<input type=radio name=global value=0 %s> $text{'no'}</td>\n",
-	$_[0]->{'global'} ? '' : 'checked';
-print "</tr>\n";
+print &ui_table_row($text{'acl_global'},
+	&ui_yesno_radio("global", $o->{'global'}));

-print "<tr> <td valign=top><b>$text{'acl_profiles'}</b></td>\n";
-print "<td colspan=3>\n";
-printf "<input type=radio name=all value=1 %s> %s\n",
-	$_[0]->{'profiles'} eq "*" ? "checked" : "", $text{'acl_all'};
-printf "<input type=radio name=all value=0 %s> %s<br>\n",
-	$_[0]->{'profiles'} eq "*" ? "" : "checked", $text{'acl_sel'};
-print "<select name=profiles multiple size=5>\n";
-local $p;
-local %can = map { $_, 1 } split(/\s+/, $_[0]->{'profiles'});
-foreach $p (&list_profiles()) {
-	printf "<option value=%s %s>%s (%s)\n",
-		$p->{'id'}, $can{$p->{'id'}} ? "selected" : "",
-		$text{'index_type'.$p->{'type'}},
-		$p->{'type'} == 1 ? $p->{'iso'} :
-		$p->{'type'} == 4 ? $p->{'sdesc'} : $p->{'source_0'}.
-					    ($p->{'source_1'} ? ", ..." : "");
-	}
-print "</select></td> </tr>\n";
+print &ui_table_row($text{'acl_profiles'},
+	&ui_radio("all", $o->{'profiles'} eq '*' ? 1 : 0,
+		  [ [ 1, $text{'acl_all'} ],
+		    [ 0, $text{'acl_sel'}."<br>" ] ])."\n".
+	&ui_select("profiles",
+		   [ split(/\s+/, $o->{'profiles'}) ],
+		   [ map { [ $_->{'id'}, $text{'index_type'.$_->{'type'}} ] }
+			 &list_profiles() ],
+		   5, 1), 3);

-print "<tr> <td><b>$text{'acl_dirs'}</b></td> <td colspan=2>\n";
-printf "<input name=dirs size=40 value='%s'></td> </tr>\n",
-	$_[0]->{'dirs'};
+print &ui_table_row($text{'acl_dirs'},
+	&ui_textbox("dirs", $o->{'dirs'}, 60), 3);
 }

 # acl_security_save(&options)
 # Parse the form for security options for the acl module
 sub acl_security_save
 {
-$_[0]->{'create'} = $in{'create'};
-$_[0]->{'edit'} = $in{'edit'};
-$_[0]->{'global'} = $in{'global'};
-$_[0]->{'profiles'} = $in{'all'} ? "*" :
-			join(" ", split(/\0/, $in{'profiles'}));
-$_[0]->{'dirs'} = $in{'dirs'};
+my ($o) = @_;
+$o->{'create'} = $in{'create'};
+$o->{'edit'} = $in{'edit'};
+$o->{'global'} = $in{'global'};
+$o->{'profiles'} = $in{'all'} ? "*" : join(" ", split(/\0/, $in{'profiles'}));
+$o->{'dirs'} = $in{'dirs'};
 }

--- a/burner/save_profile.cgi
+++ b/burner/save_profile.cgi
@@ -130,6 +130,7 @@ if ($in{'burn'} || $in{'test'}) {
 		$iso = $config{'temp'} ? "$config{'temp'}/burner.iso"
 				       : &tempname("burner.iso");
 		local $cmd = "$config{'mkisofs'} -graft-points -o $iso";
+		$cmd .= " -iso-level 3";
 		$cmd .= " -J" if ($profile->{'joliet'});
 		$cmd .= " --netatalk" if ($profile->{'netatalk'});
 		$cmd .= " --cap" if ($profile->{'cap'});
--- a/cfengine/config-openSUSE-Linux-15.0-ALL
+++ b/cfengine/config-openSUSE-Linux-15.0-ALL
@@ -0,0 +1,9 @@
+cfrun_hosts=
+cfd_conf=
+cfengine_conf=
+cfd=/usr/sbin/cfd
+cfengine_dir=/etc/cfengine
+cfrun=/usr/sbin/cfrun
+cfengine=/usr/sbin/cfengine
+start_cmd=systemctl start cfengine
+stop_cmd=systemctl stop cfengine
--- a/config-lib.pl
+++ b/config-lib.pl
@@ -58,7 +58,7 @@ foreach $o (@lang_order_list) {
 	}

 # Call any config pre-load function
-if (&foreign_func_exists($module, 'config_pre_load')) {
+if (&foreign_defined($module, 'config_pre_load')) {
 	&foreign_call($module, "config_pre_load", \%info, \@info_order);
 	&foreign_call($module, "config_pre_load", \%einfo);
 	}
@@ -281,7 +281,7 @@ if ($section) {
 # prevent changing behaviour of a module
 if (&foreign_exists($module) &&
    &foreign_require($module) &&
-    &foreign_func_exists($module, 'config_pre_load')) {
+    &foreign_defined($module, 'config_pre_load')) {
 	&foreign_call($module, "config_pre_load", \%info, \@info_order);
 	}

--- a/config-openSUSE-Linux-15.0-ALL
+++ b/config-openSUSE-Linux-15.0-ALL
@@ -0,0 +1,10 @@
+find_pid_command=ps auwwwx | grep NAME | grep -v grep | awk '{ print $2 }'
+path=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+ld_env=LD_LIBRARY_PATH
+passwd_file=/etc/shadow
+passwd_uindex=0
+passwd_pindex=1
+passwd_cindex=2
+passwd_mindex=4
+by_view=0
+tempdelete_days=7
--- a/Show More
+++ b/Show More