From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 46/54] samba: Replace security setting with server role
Date: Tue, 13 Oct 2020 16:08:04 +0000 [thread overview]
Message-ID: <20201013160812.27754-46-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 39932 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
doc/language_issues.de | 12 ++++++++++++
doc/language_issues.en | 12 ++----------
doc/language_issues.es | 12 ++++++++++++
doc/language_issues.fr | 12 ++++++++++++
doc/language_issues.it | 12 ++++++++++++
doc/language_issues.nl | 12 ++++++++++++
doc/language_issues.pl | 12 ++++++++++++
doc/language_issues.ru | 12 ++++++++++++
doc/language_issues.tr | 12 ++++++++++++
doc/language_missings | 16 ++++++++++++++++
html/cgi-bin/samba.cgi | 26 ++++++++++++++++----------
langs/en/cgi-bin/en.pl | 2 ++
12 files changed, 132 insertions(+), 20 deletions(-)
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 853e1ae9d..771e9621a 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -37,6 +37,7 @@ WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting user nonpdc
WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
@@ -142,6 +143,7 @@ WARNING: translation string unused: ccd err iroute
WARNING: translation string unused: ccd err netadr
WARNING: translation string unused: ccd maxclients
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: class in use
@@ -179,6 +181,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -186,6 +189,9 @@ WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: deprecated fs warn
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
@@ -625,6 +631,7 @@ WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -635,7 +642,10 @@ WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: runmode
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -865,6 +875,8 @@ WARNING: untranslated string: required = Required
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: show tls-auth key = Show tls-auth key
WARNING: untranslated string: smb daemon = SMB Daemon
WARNING: untranslated string: user management = unknown string
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 6e61d0475..abba7016d 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -96,7 +96,6 @@ WARNING: untranslated string: accounting = Accounting
WARNING: untranslated string: acpitemp = ACPI - Temperatures
WARNING: untranslated string: action = Action
WARNING: untranslated string: activate = Activate
-WARNING: untranslated string: activate user = Activate user
WARNING: untranslated string: active = Active
WARNING: untranslated string: add = Add
WARNING: untranslated string: add a host = Add a host
@@ -458,7 +457,6 @@ WARNING: untranslated string: certificate does not have a valid ca associated wi
WARNING: untranslated string: certificate file move failed = Certificate file move failed
WARNING: untranslated string: chain = Chain
WARNING: untranslated string: change passwords = Change passwords
-WARNING: untranslated string: change share = edit share options
WARNING: untranslated string: check all = Check all
WARNING: untranslated string: check vpn lr = Check
WARNING: untranslated string: cipher = Encryption:
@@ -533,7 +531,6 @@ WARNING: untranslated string: ddns hostname added = Dynamic DNS hostname added
WARNING: untranslated string: ddns hostname modified = Dynamic DNS hostname modified
WARNING: untranslated string: ddns hostname removed = Dynamic DNS hostname removed
WARNING: untranslated string: deactivate = deactivate
-WARNING: untranslated string: deactivate user = deactivate user
WARNING: untranslated string: dead peer detection = Dead Peer Detection
WARNING: untranslated string: december = December
WARNING: untranslated string: def lease time = Default Lease Time
@@ -542,9 +539,6 @@ WARNING: untranslated string: default IP address = Default IP Address
WARNING: untranslated string: default lease time = Default lease time (mins):
WARNING: untranslated string: default renewal time = Default Renewal Time
WARNING: untranslated string: delete = Delete
-WARNING: untranslated string: delete pc = Delete workstation
-WARNING: untranslated string: delete share = Delete share
-WARNING: untranslated string: delete user = Delete user
WARNING: untranslated string: demon login script = Demon login script
WARNING: untranslated string: desired = Desired
WARNING: untranslated string: dest ip and port = Dest. IP: Port
@@ -1542,7 +1536,6 @@ WARNING: untranslated string: restart = Restart
WARNING: untranslated string: restart ovpn server = Restart OpenVPN server
WARNING: untranslated string: restore = Restore
WARNING: untranslated string: restore defaults = Restore defaults
-WARNING: untranslated string: restore settings = Reset Settings
WARNING: untranslated string: reverse sort = Sort in reverse chronological order
WARNING: untranslated string: root certificate = Root Certificate
WARNING: untranslated string: route config changed = unknown string
@@ -1554,11 +1547,10 @@ WARNING: untranslated string: running = RUNNING
WARNING: untranslated string: samba = Samba
WARNING: untranslated string: samba join a domain = Join a domain
WARNING: untranslated string: samba join domain = Join domain
-WARNING: untranslated string: samba status = Samba Status
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: saturday = Saturday
WARNING: untranslated string: save = Save
-WARNING: untranslated string: save config = save settings
-WARNING: untranslated string: save settings = Save settings
WARNING: untranslated string: save-adv-options = Save advanced options
WARNING: untranslated string: script name = Script name:
WARNING: untranslated string: search = Search
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 7b24eec97..d0e540674 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -16,6 +16,7 @@ WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting user nonpdc
WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
@@ -130,6 +131,7 @@ WARNING: translation string unused: cannot enable both nat traversal and compres
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
@@ -169,12 +171,16 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
WARNING: translation string unused: destination ip or net
@@ -550,6 +556,7 @@ WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -559,7 +566,10 @@ WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -1328,6 +1338,8 @@ WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
WARNING: untranslated string: samba join a domain = Join a domain
WARNING: untranslated string: samba join domain = Join domain
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: search = Search
WARNING: untranslated string: sent = Sent
WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 470634f62..effe54ab2 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -41,6 +41,7 @@ WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting user nonpdc
WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
@@ -162,6 +163,7 @@ WARNING: translation string unused: ccd err iroute
WARNING: translation string unused: ccd err netadr
WARNING: translation string unused: ccd maxclients
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
@@ -202,6 +204,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -209,6 +212,9 @@ WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: deprecated fs warn
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
@@ -657,6 +663,7 @@ WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -667,7 +674,10 @@ WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: runmode
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -903,6 +913,8 @@ WARNING: untranslated string: required = Required
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: smb daemon = SMB Daemon
WARNING: untranslated string: user management = unknown string
WARNING: untranslated string: winbind daemon = Winbind Daemon
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 6f8ec84b6..cbd9ef611 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -17,6 +17,7 @@ WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting user nonpdc
WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
@@ -138,6 +139,7 @@ WARNING: translation string unused: capsinactive
WARNING: translation string unused: ccd err iroute
WARNING: translation string unused: ccd err netadr
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
@@ -177,6 +179,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -184,6 +187,9 @@ WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: deprecated fs warn
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
@@ -631,6 +637,7 @@ WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -640,7 +647,10 @@ WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -1104,6 +1114,8 @@ WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
WARNING: untranslated string: samba join a domain = Join a domain
WARNING: untranslated string: samba join domain = Join domain
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: search = Search
WARNING: untranslated string: sent = Sent
WARNING: untranslated string: smb daemon = SMB Daemon
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 41badf829..94723dad5 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -17,6 +17,7 @@ WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting user nonpdc
WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
@@ -137,6 +138,7 @@ WARNING: translation string unused: capsinactive
WARNING: translation string unused: ccd err iroute
WARNING: translation string unused: ccd err netadr
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
@@ -176,6 +178,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -183,6 +186,9 @@ WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: deprecated fs warn
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
@@ -624,6 +630,7 @@ WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -633,7 +640,10 @@ WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -1137,6 +1147,8 @@ WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
WARNING: untranslated string: samba join a domain = Join a domain
WARNING: untranslated string: samba join domain = Join domain
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: search = Search
WARNING: untranslated string: sent = Sent
WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 7b24eec97..d0e540674 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -16,6 +16,7 @@ WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting user nonpdc
WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
@@ -130,6 +131,7 @@ WARNING: translation string unused: cannot enable both nat traversal and compres
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
@@ -169,12 +171,16 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
WARNING: translation string unused: destination ip or net
@@ -550,6 +556,7 @@ WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -559,7 +566,10 @@ WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -1328,6 +1338,8 @@ WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
WARNING: untranslated string: samba join a domain = Join a domain
WARNING: untranslated string: samba join domain = Join domain
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: search = Search
WARNING: untranslated string: sent = Sent
WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 9c9a60dc9..8a296ff3d 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -17,6 +17,7 @@ WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting user nonpdc
WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
@@ -131,6 +132,7 @@ WARNING: translation string unused: cannot enable both nat traversal and compres
WARNING: translation string unused: cant enable xtaccess
WARNING: translation string unused: capsinactive
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
@@ -169,12 +171,16 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
WARNING: translation string unused: destination ip or net
@@ -553,6 +559,7 @@ WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -562,7 +569,10 @@ WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -1324,6 +1334,8 @@ WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
WARNING: untranslated string: samba join a domain = Join a domain
WARNING: untranslated string: samba join domain = Join domain
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: search = Search
WARNING: untranslated string: sent = Sent
WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index e5f558875..1cbcdd70c 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -38,6 +38,7 @@ WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting user nonpdc
WARNING: translation string unused: accounting user pdc
+WARNING: translation string unused: activate user
WARNING: translation string unused: add a new rule
WARNING: translation string unused: add cron
WARNING: translation string unused: add network
@@ -160,6 +161,7 @@ WARNING: translation string unused: capsinactive
WARNING: translation string unused: ccd err iroute
WARNING: translation string unused: ccd err netadr
WARNING: translation string unused: cfg restart
+WARNING: translation string unused: change share
WARNING: translation string unused: check for net traffic update
WARNING: translation string unused: choose config
WARNING: translation string unused: choose media
@@ -199,6 +201,7 @@ WARNING: translation string unused: ddns help freedns
WARNING: translation string unused: ddns help plus
WARNING: translation string unused: ddns minimize updates
WARNING: translation string unused: ddns noip prefix
+WARNING: translation string unused: deactivate user
WARNING: translation string unused: debugme
WARNING: translation string unused: deep scan directories
WARNING: translation string unused: default ip
@@ -206,6 +209,9 @@ WARNING: translation string unused: default networks
WARNING: translation string unused: default services
WARNING: translation string unused: defaultwarning
WARNING: translation string unused: delete cron
+WARNING: translation string unused: delete pc
+WARNING: translation string unused: delete share
+WARNING: translation string unused: delete user
WARNING: translation string unused: deprecated fs warn
WARNING: translation string unused: description
WARNING: translation string unused: destination ip bad
@@ -659,6 +665,7 @@ WARNING: translation string unused: resetglobals
WARNING: translation string unused: resetpolicy
WARNING: translation string unused: resetshares
WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: restore settings
WARNING: translation string unused: root
WARNING: translation string unused: root path
WARNING: translation string unused: root user password
@@ -668,7 +675,10 @@ WARNING: translation string unused: rsvd dst port overlap
WARNING: translation string unused: rsvd src port overlap
WARNING: translation string unused: rules already up to date
WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: samba status
+WARNING: translation string unused: save config
WARNING: translation string unused: save error
+WARNING: translation string unused: save settings
WARNING: translation string unused: select dest net
WARNING: translation string unused: select media
WARNING: translation string unused: select source net
@@ -1007,6 +1017,8 @@ WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
+WARNING: untranslated string: samba server role member = Domain Member
+WARNING: untranslated string: samba server role standalone = Standalone
WARNING: untranslated string: sent = Sent
WARNING: untranslated string: smb daemon = SMB Daemon
WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
diff --git a/doc/language_missings b/doc/language_missings
index d6b3db633..0934f8431 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -46,6 +46,8 @@
< optional
< quick control
< required
+< samba server role member
+< samba server role standalone
< shaping add options
< show areas
< show lines
@@ -729,6 +731,8 @@
< runmode
< samba join a domain
< samba join domain
+< samba server role member
+< samba server role standalone
< search
< sent
< server restart
@@ -946,6 +950,8 @@
< netbios nameserver daemon
< optional
< required
+< samba server role member
+< samba server role standalone
< smb daemon
< upload fcdsl.o
< winbind daemon
@@ -1222,6 +1228,8 @@
< runmode
< samba join a domain
< samba join domain
+< samba server role member
+< samba server role standalone
< search
< sent
< smb daemon
@@ -1634,6 +1642,8 @@
< runmode
< samba join a domain
< samba join domain
+< samba server role member
+< samba server role standalone
< search
< sent
< show dh
@@ -2391,6 +2401,8 @@
< runmode
< samba join a domain
< samba join domain
+< samba server role member
+< samba server role standalone
< search
< sent
< server restart
@@ -3256,6 +3268,8 @@
< runmode
< samba join a domain
< samba join domain
+< samba server role member
+< samba server role standalone
< search
< sent
< server restart
@@ -3578,6 +3592,8 @@
< received
< required
< runmode
+< samba server role member
+< samba server role standalone
< sent
< smb daemon
< smt disabled
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 0ea3cc789..aa91267a7 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -60,7 +60,7 @@ my %shares = ();
$sambasettings{'WORKGRP'} = 'homeip.net';
$sambasettings{'INTERFACES'} = '';
-$sambasettings{'SECURITY'} = 'user';
+$sambasettings{'ROLE'} = 'standalone';
$sambasettings{'REMOTEANNOUNCE'} = '';
$sambasettings{'REMOTESYNC'} = '';
$sambasettings{'GUESTACCOUNT'} = 'samba';
@@ -128,7 +128,6 @@ passdb backend = smbpasswd
map to guest = $sambasettings{'MAPTOGUEST'}
-security = $sambasettings{'SECURITY'}
guest account = $sambasettings{'GUESTACCOUNT'}
unix password sync = no
@@ -154,6 +153,13 @@ wide links = yes
END
;
+# Server Role
+if ($sambasettings{'ROLE'} eq "standalone") {
+ print FILE "server role = standalone\n";
+} elsif ($sambasettings{'ROLE'} eq "member") {
+ print FILE "server role = member server\n";
+}
+
if ($sambasettings{'ENCRYPTION'} =~ m/(desired|required)/) {
print FILE "smb encrypt = $1\n";
}
@@ -197,12 +203,14 @@ $selected{'ENCRYPTION'}{'optional'} = '';
$selected{'ENCRYPTION'}{'desired'} = '';
$selected{'ENCRYPTION'}{'required'} = '';
$selected{'ENCRYPTION'}{$sambasettings{'ENCRYPTION'}} = "selected='selected'";
+$selected{'ROLE'}{'standalone'} = '';
+$selected{'ROLE'}{'member'} = '';
+$selected{'ROLE'}{$sambasettings{'ROLE'}} = "selected='selected'";
if ( $sambasettings{'MAPTOGUEST'} eq "Never" ) {
$sambasettings{'MAPTOGUEST'}="Bad User";
}
$selected{'MAPTOGUEST'}{$sambasettings{'MAPTOGUEST'}} = "selected='selected'";
-$selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";
############################################################################################################################
################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ###################################
@@ -284,10 +292,9 @@ print <<END
<tr>
<td align='left' width='40%'>$Lang::tr{'security'}</td>
<td align='left'>
- <select name='SECURITY' style="width: 165px">
- <option value='user' $selected{'SECURITY'}{'user'}>User</option>
- <option value='ADS' $selected{'SECURITY'}{'ADS'}>ADS</option>
- <option value='server' $selected{'SECURITY'}{'server'}>Server</option>
+ <select name='ROLE' style="width: 165px">
+ <option value='standalone' $selected{'ROLE'}{'standalone'}>$Lang::tr{'samba server role standalone'}</option>
+ <option value='member' $selected{'ROLE'}{'member'}>$Lang::tr{'samba server role member'}</option>
</select>
</td>
</tr>
@@ -351,8 +358,7 @@ END
############################################################################################################################
########################################## Benutzerverwaltung fr Usersecurity #############################################
-if ($sambasettings{'SECURITY'} eq 'user')
- {
+if ($sambasettings{'ROLE'} eq 'standalone') {
&Header::openbox('100%', 'center', $Lang::tr{'user management'});
print <<END
<br />
@@ -520,7 +526,7 @@ END
&Header::closebox();
}
-if ($sambasettings{'SECURITY'} eq "ADS") {
+if ($sambasettings{'ROLE'} eq "member") {
&Header::openbox('100%', 'center', $Lang::tr{'samba join a domain'});
my $AD_DOMAINNAME = uc($mainsettings{'DOMAINNAME'});
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index f13f05fb4..a0419c02d 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2183,6 +2183,8 @@
'samba' => 'Samba',
'samba join a domain' => 'Join a domain',
'samba join domain' => 'Join domain',
+'samba server role member' => 'Domain Member',
+'samba server role standalone' => 'Standalone',
'samba status' => 'Samba Status',
'saturday' => 'Saturday',
'save' => 'Save',
--
2.20.1
next prev parent reply other threads:[~2020-10-13 16:08 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-13 16:07 [PATCH 01/54] samba: Migrate configuration from Samba 3.6 to 4.x Michael Tremer
2020-10-13 16:07 ` [PATCH 02/54] samba: Migrate older backups too and use standard update mechasism Michael Tremer
2020-10-13 16:07 ` [PATCH 03/54] samba: Remove deprecated syslog options Michael Tremer
2020-10-13 16:07 ` [PATCH 04/54] samba: Remove socket options Michael Tremer
2020-10-13 16:07 ` [PATCH 05/54] samba: Show status output in monospace font Michael Tremer
2020-10-13 16:07 ` [PATCH 06/54] samba: Correctly escape status output Michael Tremer
2020-10-13 16:07 ` [PATCH 07/54] samba: Update SECURITY option in settings, too Michael Tremer
2020-10-13 16:07 ` [PATCH 08/54] samba: Remove deprecated encrypt/null passwords options Michael Tremer
2020-10-13 16:07 ` [PATCH 09/54] samba: Remove any options left to default value in global section Michael Tremer
2020-10-13 16:07 ` [PATCH 10/54] sambactrl: Remove unused reset command Michael Tremer
2020-10-13 16:07 ` [PATCH 11/54] samba: Drop outdated character set settings Michael Tremer
2020-10-13 16:07 ` [PATCH 12/54] samba: Hard-code server string Michael Tremer
2020-10-13 16:07 ` [PATCH 13/54] samba: Drop netbios name option Michael Tremer
2020-10-13 16:07 ` [PATCH 14/54] samba: Remove limitation that server only uses SMB2 Michael Tremer
2020-10-13 16:07 ` [PATCH 15/54] samba: Drop support for WINS Michael Tremer
2020-10-13 16:07 ` [PATCH 16/54] samba: Log to syslog Michael Tremer
2020-10-13 16:07 ` [PATCH 17/54] samba: Remove reset options Michael Tremer
2020-10-13 16:07 ` [PATCH 18/54] samba: Remove help popup Michael Tremer
2020-10-13 16:07 ` [PATCH 19/54] samba: Always show printer options Michael Tremer
2020-10-13 16:07 ` [PATCH 20/54] samba: Remove printer management Michael Tremer
2020-10-13 16:07 ` [PATCH 21/54] samba: Export all printers from CUPS Michael Tremer
2020-10-13 16:07 ` [PATCH 22/54] samba: Add option to require clients to encrypt the connection Michael Tremer
2020-10-13 16:07 ` [PATCH 23/54] samba: Drop interfaces configuration Michael Tremer
2020-10-13 16:07 ` [PATCH 24/54] samba: Drop support for being PDC for Windows NT domains Michael Tremer
2020-10-13 16:07 ` [PATCH 25/54] samba: Remove local master option Michael Tremer
2020-10-13 16:07 ` [PATCH 26/54] samba: Remove preferred " Michael Tremer
2020-10-13 16:07 ` [PATCH 27/54] samba: Drop PDC default configuration Michael Tremer
2020-10-13 16:07 ` [PATCH 28/54] samba: Remove OS level Michael Tremer
2020-10-13 16:07 ` [PATCH 29/54] samba: Remove move unused network variables Michael Tremer
2020-10-13 16:07 ` [PATCH 30/54] samba: Remove un-exported password sync option Michael Tremer
2020-10-13 16:07 ` [PATCH 31/54] samba: Refactor service status Michael Tremer
2020-10-13 16:07 ` [PATCH 32/54] samba: Drop refresh page hack Michael Tremer
2020-10-13 16:07 ` [PATCH 33/54] samba: Add tbl class to all <table>s Michael Tremer
2020-10-13 16:07 ` [PATCH 34/54] samba: Replace icons on top of page with buttons Michael Tremer
2020-10-13 16:07 ` [PATCH 35/54] samba: Re-indent global settings table Michael Tremer
2020-10-13 16:07 ` [PATCH 36/54] samba: Replace save icon with a button and remove legend Michael Tremer
2020-10-13 16:07 ` [PATCH 37/54] samba: Remove more legends Michael Tremer
2020-10-13 16:07 ` [PATCH 38/54] samba: Remove unused anchors Michael Tremer
2020-10-13 16:07 ` [PATCH 39/54] samba: Refactor shares section Michael Tremer
2020-10-13 16:07 ` [PATCH 40/54] samba: Refactor status area Michael Tremer
2020-10-13 16:07 ` [PATCH 41/54] samba: Use full page width for all tables Michael Tremer
2020-10-13 16:08 ` [PATCH 42/54] samba: Enable support for Apple's OS X by default Michael Tremer
2020-10-13 16:08 ` [PATCH 43/54] samba: Drop choice to enable/disable wide links/UNIX extensions Michael Tremer
2020-10-13 16:08 ` [PATCH 44/54] samba: Add recycle extension, too Michael Tremer
2020-10-13 16:08 ` [PATCH 45/54] samba: Change share template to something more safe Michael Tremer
2020-10-13 16:08 ` Michael Tremer [this message]
2020-10-13 16:08 ` [PATCH 47/54] samba: Automatically migrate role setting Michael Tremer
2020-10-13 16:08 ` [PATCH 48/54] samba: Remove tbl class from join form Michael Tremer
2020-10-13 16:08 ` [PATCH 49/54] samba: Set a useful default workgroup Michael Tremer
2020-10-13 16:08 ` [PATCH 50/54] samba: Refactor user management Michael Tremer
2020-10-13 16:08 ` [PATCH 51/54] samba: Use the same delete icon as everywhere else Michael Tremer
2020-10-13 16:08 ` [PATCH 52/54] samba: Remove unused INTERFACES setting Michael Tremer
2020-10-13 16:08 ` [PATCH 53/54] samba: Allow rewriting configuration from CLI Michael Tremer
2020-10-13 16:08 ` [PATCH 54/54] samba: Bump package version Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201013160812.27754-46-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox