From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer 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 Message-ID: <20201013160812.27754-46-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6946225833557017334==" List-Id: --===============6946225833557017334== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- 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 =3D Required WARNING: untranslated string: route config changed =3D unknown string WARNING: untranslated string: routing config added =3D unknown string WARNING: untranslated string: routing config changed =3D unknown string +WARNING: untranslated string: samba server role member =3D Domain Member +WARNING: untranslated string: samba server role standalone =3D Standalone WARNING: untranslated string: show tls-auth key =3D Show tls-auth key WARNING: untranslated string: smb daemon =3D SMB Daemon WARNING: untranslated string: user management =3D 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 =3D Accounting WARNING: untranslated string: acpitemp =3D ACPI - Temperatures WARNING: untranslated string: action =3D Action WARNING: untranslated string: activate =3D Activate -WARNING: untranslated string: activate user =3D Activate user WARNING: untranslated string: active =3D Active WARNING: untranslated string: add =3D Add WARNING: untranslated string: add a host =3D 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 =3D Certificate f= ile move failed WARNING: untranslated string: chain =3D Chain WARNING: untranslated string: change passwords =3D Change passwords -WARNING: untranslated string: change share =3D edit share options WARNING: untranslated string: check all =3D Check all WARNING: untranslated string: check vpn lr =3D Check WARNING: untranslated string: cipher =3D Encryption: @@ -533,7 +531,6 @@ WARNING: untranslated string: ddns hostname added =3D Dyn= amic DNS hostname added WARNING: untranslated string: ddns hostname modified =3D Dynamic DNS hostnam= e modified WARNING: untranslated string: ddns hostname removed =3D Dynamic DNS hostname= removed WARNING: untranslated string: deactivate =3D deactivate -WARNING: untranslated string: deactivate user =3D deactivate user WARNING: untranslated string: dead peer detection =3D Dead Peer Detection WARNING: untranslated string: december =3D December WARNING: untranslated string: def lease time =3D Default Lease Time @@ -542,9 +539,6 @@ WARNING: untranslated string: default IP address =3D Defa= ult IP Address WARNING: untranslated string: default lease time =3D Default lease time (min= s): WARNING: untranslated string: default renewal time =3D Default Renewal Time WARNING: untranslated string: delete =3D Delete -WARNING: untranslated string: delete pc =3D Delete workstation -WARNING: untranslated string: delete share =3D Delete share -WARNING: untranslated string: delete user =3D Delete user WARNING: untranslated string: demon login script =3D Demon login script WARNING: untranslated string: desired =3D Desired WARNING: untranslated string: dest ip and port =3D Dest. IP: Port @@ -1542,7 +1536,6 @@ WARNING: untranslated string: restart =3D Restart WARNING: untranslated string: restart ovpn server =3D Restart OpenVPN server WARNING: untranslated string: restore =3D Restore WARNING: untranslated string: restore defaults =3D Restore defaults -WARNING: untranslated string: restore settings =3D Reset Settings WARNING: untranslated string: reverse sort =3D Sort in reverse chronological= order WARNING: untranslated string: root certificate =3D Root Certificate WARNING: untranslated string: route config changed =3D unknown string @@ -1554,11 +1547,10 @@ WARNING: untranslated string: running =3D RUNNING WARNING: untranslated string: samba =3D Samba WARNING: untranslated string: samba join a domain =3D Join a domain WARNING: untranslated string: samba join domain =3D Join domain -WARNING: untranslated string: samba status =3D Samba Status +WARNING: untranslated string: samba server role member =3D Domain Member +WARNING: untranslated string: samba server role standalone =3D Standalone WARNING: untranslated string: saturday =3D Saturday WARNING: untranslated string: save =3D Save -WARNING: untranslated string: save config =3D save settings -WARNING: untranslated string: save settings =3D Save settings WARNING: untranslated string: save-adv-options =3D Save advanced options WARNING: untranslated string: script name =3D Script name: WARNING: untranslated string: search =3D 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 na= t 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 = =3D unknown string WARNING: untranslated string: routing table =3D unknown string WARNING: untranslated string: samba join a domain =3D Join a domain WARNING: untranslated string: samba join domain =3D Join domain +WARNING: untranslated string: samba server role member =3D Domain Member +WARNING: untranslated string: samba server role standalone =3D Standalone WARNING: untranslated string: search =3D Search WARNING: untranslated string: sent =3D Sent WARNING: untranslated string: server restart =3D You are not able to save an= y 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 =3D Required WARNING: untranslated string: route config changed =3D unknown string WARNING: untranslated string: routing config added =3D unknown string WARNING: untranslated string: routing config changed =3D unknown string +WARNING: untranslated string: samba server role member =3D Domain Member +WARNING: untranslated string: samba server role standalone =3D Standalone WARNING: untranslated string: smb daemon =3D SMB Daemon WARNING: untranslated string: user management =3D unknown string WARNING: untranslated string: winbind daemon =3D 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 = =3D unknown string WARNING: untranslated string: routing table =3D unknown string WARNING: untranslated string: samba join a domain =3D Join a domain WARNING: untranslated string: samba join domain =3D Join domain +WARNING: untranslated string: samba server role member =3D Domain Member +WARNING: untranslated string: samba server role standalone =3D Standalone WARNING: untranslated string: search =3D Search WARNING: untranslated string: sent =3D Sent WARNING: untranslated string: smb daemon =3D 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 = =3D unknown string WARNING: untranslated string: routing table =3D unknown string WARNING: untranslated string: samba join a domain =3D Join a domain WARNING: untranslated string: samba join domain =3D Join domain +WARNING: untranslated string: samba server role member =3D Domain Member +WARNING: untranslated string: samba server role standalone =3D Standalone WARNING: untranslated string: search =3D Search WARNING: untranslated string: sent =3D Sent WARNING: untranslated string: show dh =3D 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 na= t 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 = =3D unknown string WARNING: untranslated string: routing table =3D unknown string WARNING: untranslated string: samba join a domain =3D Join a domain WARNING: untranslated string: samba join domain =3D Join domain +WARNING: untranslated string: samba server role member =3D Domain Member +WARNING: untranslated string: samba server role standalone =3D Standalone WARNING: untranslated string: search =3D Search WARNING: untranslated string: sent =3D Sent WARNING: untranslated string: server restart =3D You are not able to save an= y 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 na= t 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 = =3D unknown string WARNING: untranslated string: routing table =3D unknown string WARNING: untranslated string: samba join a domain =3D Join a domain WARNING: untranslated string: samba join domain =3D Join domain +WARNING: untranslated string: samba server role member =3D Domain Member +WARNING: untranslated string: samba server role standalone =3D Standalone WARNING: untranslated string: search =3D Search WARNING: untranslated string: sent =3D Sent WARNING: untranslated string: server restart =3D You are not able to save an= y 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 =3D = unknown string WARNING: untranslated string: routing config added =3D unknown string WARNING: untranslated string: routing config changed =3D unknown string WARNING: untranslated string: routing table =3D unknown string +WARNING: untranslated string: samba server role member =3D Domain Member +WARNING: untranslated string: samba server role standalone =3D Standalone WARNING: untranslated string: sent =3D Sent WARNING: untranslated string: smb daemon =3D SMB Daemon WARNING: untranslated string: smt disabled =3D 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 =3D (); =20 $sambasettings{'WORKGRP'} =3D 'homeip.net'; $sambasettings{'INTERFACES'} =3D ''; -$sambasettings{'SECURITY'} =3D 'user'; +$sambasettings{'ROLE'} =3D 'standalone'; $sambasettings{'REMOTEANNOUNCE'} =3D ''; $sambasettings{'REMOTESYNC'} =3D ''; $sambasettings{'GUESTACCOUNT'} =3D 'samba'; @@ -128,7 +128,6 @@ passdb backend =3D smbpasswd =20 map to guest =3D $sambasettings{'MAPTOGUEST'} =20 -security =3D $sambasettings{'SECURITY'} guest account =3D $sambasettings{'GUESTACCOUNT'} unix password sync =3D no =20 @@ -154,6 +153,13 @@ wide links =3D yes END ; =20 +# Server Role +if ($sambasettings{'ROLE'} eq "standalone") { + print FILE "server role =3D standalone\n"; +} elsif ($sambasettings{'ROLE'} eq "member") { + print FILE "server role =3D member server\n"; +} + if ($sambasettings{'ENCRYPTION'} =3D~ m/(desired|required)/) { print FILE "smb encrypt =3D $1\n"; } @@ -197,12 +203,14 @@ $selected{'ENCRYPTION'}{'optional'} =3D ''; $selected{'ENCRYPTION'}{'desired'} =3D ''; $selected{'ENCRYPTION'}{'required'} =3D ''; $selected{'ENCRYPTION'}{$sambasettings{'ENCRYPTION'}} =3D "selected=3D'selec= ted'"; +$selected{'ROLE'}{'standalone'} =3D ''; +$selected{'ROLE'}{'member'} =3D ''; +$selected{'ROLE'}{$sambasettings{'ROLE'}} =3D "selected=3D'selected'"; =20 if ( $sambasettings{'MAPTOGUEST'} eq "Never" ) { $sambasettings{'MAPTOGUEST'}=3D"Bad User"; } $selected{'MAPTOGUEST'}{$sambasettings{'MAPTOGUEST'}} =3D "selected=3D'selec= ted'"; -$selected{'SECURITY'}{$sambasettings{'SECURITY'}} =3D "selected=3D'selected'= "; =20 ############################################################################= ################################################ ################################### Aufbau der HTML Seite fr globale Sambaei= nstellungen ################################### @@ -284,10 +292,9 @@ print < $Lang::tr{'security'} - + + @@ -351,8 +358,7 @@ END ############################################################################= ################################################ ########################################## Benutzerverwaltung fr Usersecurit= y ############################################# =20 -if ($sambasettings{'SECURITY'} eq 'user') - { +if ($sambasettings{'ROLE'} eq 'standalone') { &Header::openbox('100%', 'center', $Lang::tr{'user management'}); print < @@ -520,7 +526,7 @@ END &Header::closebox(); } =20 -if ($sambasettings{'SECURITY'} eq "ADS") { +if ($sambasettings{'ROLE'} eq "member") { &Header::openbox('100%', 'center', $Lang::tr{'samba join a domain'}); =20 my $AD_DOMAINNAME =3D 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' =3D> 'Samba', 'samba join a domain' =3D> 'Join a domain', 'samba join domain' =3D> 'Join domain', +'samba server role member' =3D> 'Domain Member', +'samba server role standalone' =3D> 'Standalone', 'samba status' =3D> 'Samba Status', 'saturday' =3D> 'Saturday', 'save' =3D> 'Save', --=20 2.20.1 --===============6946225833557017334==--