From patchwork Tue Oct 13 16:07:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3527 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSk01jkz3x1S for ; Tue, 13 Oct 2020 16:08:21 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSg3ncBzvc; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSg1rMXz303x; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSd5B9Jz2xZt for ; Tue, 13 Oct 2020 16:08:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSc6x6kzlb; Tue, 13 Oct 2020 16:08:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vxvhdb8jlrpGw5I6F3x5y1ZgoRCEIG0hYwN1zjC7DSI=; b=I2U1JnjobD3iGe4CNWpzcj6ZKFSHF9IolJ6PTH+6qa1XWkDEhQraI1eOCzRhrA3JMQ8mXn M64JLRX/UAQxD4Ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vxvhdb8jlrpGw5I6F3x5y1ZgoRCEIG0hYwN1zjC7DSI=; b=HWKU27UDoiv0n7V55886HcL9pTL23j5+nIsEjYE8Y3ckdYv4l5Rhxv4ICKReKNiM2uF3K3 CgI4SYK2uAjxp1v0fzLg/tcXtPHVkFnVX1q/fSmUXRDEhETOwDBttkiwOZijE9PTyQbw9n rTTP7LpIVqXClNLTb7R2G5zTC8uvgSLJDPc4EMzii8lfbNBy2JfHahW4Czprq790vIjtat NZFtu2xYUtcu5xLxWwtjw2vdgEUv8nTeu2iDiAOOwn1ndOM/zESC6kscPMS59I8xG1KJuf 447n/BZjnZMqre2ScGgtXEAvEgtVaBQJeXoJQ93mqkWM3iJe2eCHkOA9e7XJXg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 01/54] samba: Migrate configuration from Samba 3.6 to 4.x Date: Tue, 13 Oct 2020 16:07:19 +0000 Message-Id: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- src/paks/samba/update.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/paks/samba/update.sh b/src/paks/samba/update.sh index 648b025b7..76875657b 100644 --- a/src/paks/samba/update.sh +++ b/src/paks/samba/update.sh @@ -33,5 +33,10 @@ fi extract_files restore_backup ${NAME} -echo "passdb backend = smbpasswd" >> /var/ipfire/samba/smb.conf + +# Migrate configuration from Samba 3.6 to 4.x +sed -i /var/ipfire/samba/smb.conf \ + -e "/^display charset =/d" \ + -e "s/^security = share$/security = user/" + /usr/local/bin/sambactrl smbstart From patchwork Tue Oct 13 16:07:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3528 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSk5pLYz3x3M for ; Tue, 13 Oct 2020 16:08:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSg5drYz1Fv; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSg2RRHz304P; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSd62ftz2xb4 for ; Tue, 13 Oct 2020 16:08:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSd4CjJzvc; Tue, 13 Oct 2020 16:08:17 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vycovQfICFcewIYBxci/u4bhfxxhChzXBc4NRqhK9nE=; b=so6oV1kfu0Lx7ARvjNqHVAe5UmkfW0eBTgSJ5sZrg7fkLOFuUMZ3aWi7XWs84UV+WGJmir zVibO/qQbrHOzlCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vycovQfICFcewIYBxci/u4bhfxxhChzXBc4NRqhK9nE=; b=WN6Hb1S8d3wnS+kgORrV2LGja+ynXDByygyeAsLbflfw5/dzHbuiFdo6SRjaOthyg8qNal HKrx+pa9oYaRaZWGu4fDc7HwMrd+gI+9pb/ZhzbD/zEdMMiG4dBKPvMtYLb4C+ZAxd1SIU dogHEaqjLKSEq3OUPyIZYVrP/ALRN0SFRn2vY7griiI9uHAwIAMkhhsPpj0ubUq18PU1rL +7qVb07bfWPFF3u1MW0OC0LJxQbrHoBD+AS+zaHgjsa7wKmMi0YXYCA6Zi+eEl5/5jSuBb yBfUFdVenLqBJuwPFegSFzaYiY1sVX+hm658cUGS5IYpyU4TEwRxfEsWI4EkXA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 02/54] samba: Migrate older backups too and use standard update mechasism Date: Tue, 13 Oct 2020 16:07:20 +0000 Message-Id: <20201013160812.27754-2-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- src/paks/samba/install.sh | 7 +++++++ src/paks/samba/update.sh | 21 +++------------------ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh index b7a2fc1cc..55525d08a 100644 --- a/src/paks/samba/install.sh +++ b/src/paks/samba/install.sh @@ -32,4 +32,11 @@ fi extract_files restore_backup ${NAME} + +# Migrate configuration from Samba 3.6 to 4.x +sed -i /var/ipfire/samba/smb.conf \ + -e "/^display charset =/d" \ + -e "s/^security = share$/security = user/" + +# Start the service /usr/local/bin/sambactrl smbstart diff --git a/src/paks/samba/update.sh b/src/paks/samba/update.sh index 76875657b..99776659c 100644 --- a/src/paks/samba/update.sh +++ b/src/paks/samba/update.sh @@ -17,26 +17,11 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2010 IPFire-Team . # +# Copyright (C) 2007-2020 IPFire-Team . # # # ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes ./uninstall.sh - -# If the wbpriv group does not exist yet, then create it and put squid -# into it. -if ! getent group wbpriv >/dev/null; then - groupadd -g 88 wbpriv - usermod -a -G wbpriv squid -fi - -extract_files -restore_backup ${NAME} - -# Migrate configuration from Samba 3.6 to 4.x -sed -i /var/ipfire/samba/smb.conf \ - -e "/^display charset =/d" \ - -e "s/^security = share$/security = user/" - -/usr/local/bin/sambactrl smbstart +./install.sh From patchwork Tue Oct 13 16:07:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3529 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSl37CDz3x1S for ; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSh0mCrz1GB; Tue, 13 Oct 2020 16:08:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSg36rLz303l; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSd6sQ9z2xZt for ; Tue, 13 Oct 2020 16:08:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSd5lzlzlb; Tue, 13 Oct 2020 16:08:17 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MRg4qU4mOBrhdIkyLs7GF9qHXciUw/yLiplM5zMBqYY=; b=xyH91Sphu7h0qTmOk4zeLTfdJhMN3sT6nptIUeQateL+tI4j0BzMu/sU375gIWDSrf0NHo ByvMXa9mDv5idqBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MRg4qU4mOBrhdIkyLs7GF9qHXciUw/yLiplM5zMBqYY=; b=v3V59bCh00ZhehiJhRj453PJg4IPeW3K5auSIJb+39HS+QnlC+Zmk/jsAgKHiclLIwtBY1 /ITM4itw0t7/L5/ECSvetmBioFzy2meXSWVp6yYigAs4anq3knYe1+Y7u17o4pybi+k8UB IKm5BXQzmuS36uIkgyVJ2j0tJYmVQzmpV6gsl7/3AsVwhqX2C6PgZ3igADuRDixIQSO2hd 1+gkBAUiyS7Q8NajD8N8ZSCpGHoPWFkcXHzVaBfiFFEzru4y3o352HN0bc5RO+cLHR+hcj cnzqK4m7WcjJOQzzCh2JUBWE64ujnjypM7eAHeLIb+MbqLWVJLCRUmr8NhW3bw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 03/54] samba: Remove deprecated syslog options Date: Tue, 13 Oct 2020 16:07:21 +0000 Message-Id: <20201013160812.27754-3-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 13 ------------- src/paks/samba/install.sh | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index d88a2ee47..4e6cd45e4 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -93,8 +93,6 @@ $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; -$sambasettings{'SYSLOGLEVEL'} = '1'; -$sambasettings{'SYSLOGONLY'} = 'on'; $sambasettings{'DOSCHARSET'} = 'CP850'; $sambasettings{'UNIXCHARSET'} = 'UTF8'; $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_KEEPALIVE'; @@ -164,8 +162,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; - $sambasettings{'SYSLOGLEVEL'} = '1'; - $sambasettings{'SYSLOGONLY'} = 'on'; $sambasettings{'DOSCHARSET'} = 'CP850'; $sambasettings{'UNIXCHARSET'} = 'UTF8'; ### Samba CUPS Variablen @@ -260,7 +256,6 @@ if ($sambasettings{'WINSSUPPORT'} eq 'on'){ $sambasettings{'WINSSUPPORT'} = "tru if ($sambasettings{'LOCALMASTER'} eq 'on'){ $sambasettings{'LOCALMASTER'} = "true";} else { $sambasettings{'LOCALMASTER'} = "false";} if ($sambasettings{'DOMAINMASTER'} eq 'on'){ $sambasettings{'DOMAINMASTER'} = "true";} else { $sambasettings{'DOMAINMASTER'} = "false";} if ($sambasettings{'PREFERREDMASTER'} eq 'on'){ $sambasettings{'PREFERREDMASTER'} = "true";} else { $sambasettings{'PREFERREDMASTER'} = "false";} -if ($sambasettings{'SYSLOGONLY'} eq 'on'){ $sambasettings{'SYSLOGONLY'} = "yes";} else { $sambasettings{'SYSLOGONLY'} = "no";} if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} = "yes";} else { $sambasettings{'WIDELINKS'} = "no";} if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'} = "yes";} else { $sambasettings{'UNIXEXTENSION'} = "no";} @@ -324,8 +319,6 @@ winbind use default domain = yes log file = /var/log/samba/samba-log.%m pid directory = /var/run/ log level = $sambasettings{'LOGLEVEL'} -syslog = $sambasettings{'SYSLOGLEVEL'} -syslog only = $sambasettings{'SYSLOGONLY'} preferred master = $sambasettings{'PREFERREDMASTER'} domain master = $sambasettings{'DOMAINMASTER'} @@ -401,9 +394,6 @@ if ($message) { ############################################################################################################################ ########################################## Aktivieren von Checkboxen und Dropdowns ######################################### -$checked{'SYSLOGONLY'}{'off'} = ''; -$checked{'SYSLOGONLY'}{'on'} = ''; -$checked{'SYSLOGONLY'}{$sambasettings{'SYSLOGONLY'}} = "checked='checked'"; $checked{'WINSSUPPORT'}{'off'} = ''; $checked{'WINSSUPPORT'}{'on'} = ''; $checked{'WINSSUPPORT'}{$sambasettings{'WINSSUPPORT'}} = "checked='checked'"; @@ -487,9 +477,6 @@ print <$Lang::tr{'unix charset'} $Lang::tr{'server string'} $Lang::tr{'log level'} -Sys$Lang::tr{'log level'} -Syslog onlyon / - off $Lang::tr{'interfaces'}on / off | OpenVpn - $ovpnip[0].$ovpnip[1].$ovpnip[2].$ovpnip[3]/$ovpnnetwork[1] diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh index 55525d08a..7d360176a 100644 --- a/src/paks/samba/install.sh +++ b/src/paks/samba/install.sh @@ -36,6 +36,7 @@ restore_backup ${NAME} # Migrate configuration from Samba 3.6 to 4.x sed -i /var/ipfire/samba/smb.conf \ -e "/^display charset =/d" \ + -e "/^syslog/d" \ -e "s/^security = share$/security = user/" # Start the service From patchwork Tue Oct 13 16:07:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3530 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSl6tmFz3x5t for ; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSh3fjLz1GH; Tue, 13 Oct 2020 16:08:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSg3nQ2z304c; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSf0Sdtz2xb4 for ; Tue, 13 Oct 2020 16:08:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSd6ZGgz19Q; Tue, 13 Oct 2020 16:08:17 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kwrPOLQx6QMyzWX8iJBqMeVQE2jlQBdXpCSwPn/LJrg=; b=VtDjJqkmosoqCx/FMCjmcgPUF3STXOMDLKzx4kQaYlAu/GPJMaKVTYfacJItHv4wplg1RR cETyCIHHDyOC4/BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kwrPOLQx6QMyzWX8iJBqMeVQE2jlQBdXpCSwPn/LJrg=; b=oN99Kx66grKHbYbkq5tK8X3bt00sfBlblXIlV26T1Ms8FoaLY+zhdyMpeUMOC4ho+Xz8V2 JswFsWglS8Y6FD+jsSAUqVgYnuHA6dlTProEAsyoP+xGcIIPVzL915cs7pxEu2tnkX8eWw OC0wZt8+ThOv0NH3lvefhSzPpie6lIc3gk7iI/8Xw30q+EsoWl/+kKbilHQcoJcY9xrG7S 9L5ztjuHNK2dJpbYKgHcyFH0lNC/pKEEsXMKFcBC2LywJB61b2IK0zEv0MPPvN8Uu+LtSV DMr9X70eq7ep/it5/jkkB3CfeiP+MPmcU1O00BjKxMm6GKLgzUGzX1ls82AjjQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 04/54] samba: Remove socket options Date: Tue, 13 Oct 2020 16:07:22 +0000 Message-Id: <20201013160812.27754-4-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" It is not useful to set this on a modern server. The Linux kernel will be tuning any send and receive buffer sizes. Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 4 ---- src/paks/samba/install.sh | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 4e6cd45e4..72bf8c469 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -95,7 +95,6 @@ $sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; $sambasettings{'DOSCHARSET'} = 'CP850'; $sambasettings{'UNIXCHARSET'} = 'UTF8'; -$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_KEEPALIVE'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; $sambasettings{'SMB2'} = 'on'; @@ -176,7 +175,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'LOCALMASTER'} = 'off'; $sambasettings{'DOMAINMASTER'} = 'off'; $sambasettings{'PREFERREDMASTER'} = 'off'; - $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_KEEPALIVE'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; $sambasettings{'SMB2'} = 'on'; @@ -303,7 +301,6 @@ null passwords = yes bind interfaces only = true interfaces = $sambasettings{'INTERFACES'} -socket options = $sambasettings{'SOCKETOPTIONS'} remote announce = $sambasettings{'REMOTEANNOUNCE'} remote browse sync = $sambasettings{'REMOTESYNC'} @@ -535,7 +532,6 @@ print <
$Lang::tr{'network options'} $Lang::tr{'os level'} -$Lang::tr{'socket options'} $Lang::tr{'remote announce'} $Lang::tr{'remote browse sync'} END diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh index 7d360176a..7b81be7c1 100644 --- a/src/paks/samba/install.sh +++ b/src/paks/samba/install.sh @@ -36,6 +36,7 @@ restore_backup ${NAME} # Migrate configuration from Samba 3.6 to 4.x sed -i /var/ipfire/samba/smb.conf \ -e "/^display charset =/d" \ + -e "/^socket options =/d" \ -e "/^syslog/d" \ -e "s/^security = share$/security = user/" From patchwork Tue Oct 13 16:07:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3531 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSm37LZz3x3M for ; Tue, 13 Oct 2020 16:08:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSh6MZpz1GR; Tue, 13 Oct 2020 16:08:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSg4Kcsz304Q; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSf185qz2xZt for ; Tue, 13 Oct 2020 16:08:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSf07rszvc; Tue, 13 Oct 2020 16:08:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gv9hWgMRc25EX4aVyT3W3Vt0XitU4+06/LAKPVjhVqs=; b=yyIuVaBdFVcERR/VphDb+5gsljYzmHaAT0PH9fVU1CMCNXi2ivsUdYvySimfkRg97KSmOv ciwXOh+g98vGlgCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gv9hWgMRc25EX4aVyT3W3Vt0XitU4+06/LAKPVjhVqs=; b=rR9FnWC0HZdIB3ZodC4JRL0HPYY7Kk753OXIZN3h2J8zmZOcCv8SM6IvJeqPoghkjZ59+M w7bJkNSDt2MWLh5T4FBx4fa0alfHxiA9EvBN+qUdWB8/icE00i0CnoEKwiu+e1X82xvBg7 dEV2heY2bHqm2M1MIPGRNtJC1D4SS8IpNl9YAFbphG5Twifzc1BoJ1jdBkM2MJdFKqV3Wd EYv4QoB1uO+T3kz69/bn6gY1qzPRKEPI961pN6eLWf3fFxcSQOCgqtEcacoY/Pg4uBtQ2O FcR6Qk3dZJwix2Fh0285zbE7Gt4qJ8NWW3QH7yYO9DDy0XnLKW4jyaOFaC9Xnw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 05/54] samba: Show status output in monospace font Date: Tue, 13 Oct 2020 16:07:23 +0000 Message-Id: <20201013160812.27754-5-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 72bf8c469..634f6adb5 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -1195,7 +1195,7 @@ print < - +
$Lang::tr{'samba status'}
$Status
$Status
END ; From patchwork Tue Oct 13 16:07:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3532 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSq5Q87z3x1S for ; Tue, 13 Oct 2020 16:08:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSj4lt8z1GX; Tue, 13 Oct 2020 16:08:21 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSh4wdbz303l; Tue, 13 Oct 2020 16:08:20 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSf1p48z2xb4 for ; Tue, 13 Oct 2020 16:08:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSf0pgnzlb; Tue, 13 Oct 2020 16:08:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6Rm9OEJukiGqKOPanBZXSwG6JXmly2+5mW5Ceqrfc6I=; b=6KIkGPcBEDrOiqHXF1wJ8I9+1kGgk/fzaRxFa8TTN2h+6LDITf8rWTKfAwW8TUenCqQ8Xe Mqoo5QVlxPJv20DA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6Rm9OEJukiGqKOPanBZXSwG6JXmly2+5mW5Ceqrfc6I=; b=Pm/CF/KoTJHzc+aeMvC5EB+gn3RFGYw/rJPAu1OrzWQQJayP1w606E/4UG2uc8V2kyetFQ b1TrXBFwryIWRFscss86pSV75CNfMTTPUdXQXsI083ttREkryia7Vidq0Vd2ABQpQUIbMg veZRVbQBRkevC49IQgreGJcHSPrlGwNjvJRkYhch00FKah9Eg40UOkQ4Qez6mQqMgwfPpj Cn2q+MiNV8ArBsaOGuwlHFZgdIg2dlBEpHFfJay66bn8I2xnBxuZcDGSs5jIqDAlJyxNM/ jXkFtZ6nWpEQ+VYRkTEJXxrW2nUCI1ovvB5AoRzVSc1aKTlKEDZvy43307orCQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 06/54] samba: Correctly escape status output Date: Tue, 13 Oct 2020 16:07:24 +0000 Message-Id: <20201013160812.27754-6-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 634f6adb5..981d5dcbe 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -42,7 +42,7 @@ my @Logs = qx(ls /var/log/samba/); my $Log =$Lang::tr{'no log selected'}; my $Status = qx(/usr/local/bin/sambactrl smbstatus); -$Status=~s/\n/
/g; +$Status = &Header::cleanhtml($Status); my $userentry = ""; my @user = (); From patchwork Tue Oct 13 16:07:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3533 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSr0SN7z3x3M for ; Tue, 13 Oct 2020 16:08:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSk0xTfz1Gc; Tue, 13 Oct 2020 16:08:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSh5bvMz304c; Tue, 13 Oct 2020 16:08:20 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSf2TfGz2xZt for ; Tue, 13 Oct 2020 16:08:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSf1SZ1zvc; Tue, 13 Oct 2020 16:08:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pgM4Jjz/wJn8UYAJL5cpYnNhHQBRCLQaeqHrqyWkeQs=; b=O/dgEF9PvATd6GSr7XhKei4bbwxHn8R3p8g5WC8Snv8R2mey6UKLFOri1HktqukxfIyZJe H6guFOGWfhYZT4Cw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pgM4Jjz/wJn8UYAJL5cpYnNhHQBRCLQaeqHrqyWkeQs=; b=wS+teYhixwurS71FdtRxWAjRa47HrxgT5KxcBMiLs8rzHIaFeFXNHq9vrMF5D75QudzKMR o7XivpL9QFuWDEL3KL/5vOUNib5tMHdzAhNal790qHlVWOVX15p/GOnpuuw3mvFeBMwePk ufspqoZqHicjIJQ/PYJH+ihiuB9v7M4NiOJdLbkPufRPAkf80rEKwdxAVXYltnHPnC4eC6 iuwYOoHvvUbyzmZZrkeIVE/xykXcW4MWGlIm7lgFuIhy6eTntER/3XMgKWx/TRzhsHDtE3 2uyMuRqWyhywuWfmuOkRUupJ2qkRlu+U4uhLlDrcNZDaB3xfY0iTd4vWFhtIcg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 07/54] samba: Update SECURITY option in settings, too Date: Tue, 13 Oct 2020 16:07:25 +0000 Message-Id: <20201013160812.27754-7-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- src/paks/samba/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh index 7b81be7c1..1cd6a1156 100644 --- a/src/paks/samba/install.sh +++ b/src/paks/samba/install.sh @@ -40,5 +40,8 @@ sed -i /var/ipfire/samba/smb.conf \ -e "/^syslog/d" \ -e "s/^security = share$/security = user/" +sed -i /var/ipfire/samba/settings \ + -e "s/^SECURITY=share/SECURITY=user/" + # Start the service /usr/local/bin/sambactrl smbstart From patchwork Tue Oct 13 16:07:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3535 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSt2NsFz3x3M for ; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSk2Fs4z1Gh; Tue, 13 Oct 2020 16:08:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSh6HPxz3054; Tue, 13 Oct 2020 16:08:20 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSf39CYz2xb4 for ; Tue, 13 Oct 2020 16:08:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSf28HHz19Q; Tue, 13 Oct 2020 16:08:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D+JaeDI4jjTMheobN4u3/wWs3XdZABmv3YmJsoLKEyo=; b=iz5O4bVEcEj5NtjlellCtRUxtKJluyY81b9ni5yodXsvojYtbnyq7roT65ZnTKUXEuTN0I IsteILkOCeb0l2Dw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D+JaeDI4jjTMheobN4u3/wWs3XdZABmv3YmJsoLKEyo=; b=IGYAmtgVLEAZcyf572bHTQEfZZHvFmdENkYBivfunC+pTiMtcxfYmwnrWgdp0cgaiv8+3c ESFiyJtbV8AHn70Z9g6XOPrJOyF/wdpCEn8KJTKBw04P3/KmPEFI29OM0m9neUoxBP3p99 UOyDcyo6oJQwWOyd6PT3gZZFlNCdDcyo00/k/+2Rvt7G4G29kXavzUNlsHnh+yTfdRXhje 8a9aN4+r9Vi1QCVHguLI08QoWe4/EEzgZEn0AKE5VXrY/qXDe4z9YwsBdZx9NTdTdY/FWr KZYotFVB3dpaX6ROLPC0ZNSXG9nIwIlCIzRInaBgsWJMaoJj+1xP55BRD+bV+Q== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 08/54] samba: Remove deprecated encrypt/null passwords options Date: Tue, 13 Oct 2020 16:07:26 +0000 Message-Id: <20201013160812.27754-8-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/samba/default.global | 2 -- html/cgi-bin/samba.cgi | 2 -- src/paks/samba/install.sh | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/samba/default.global b/config/samba/default.global index 5a6a81729..30587e47a 100644 --- a/config/samba/default.global +++ b/config/samba/default.global @@ -16,10 +16,8 @@ smb ports = 445 139 unix charset = CP850 security = user -encrypt passwords = yes guest account = samba unix password sync = false -null passwords = yes bind interfaces only = true interfaces = green0 127.0.0.1 diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 981d5dcbe..fd43afd17 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -294,10 +294,8 @@ dos charset = $sambasettings{'DOSCHARSET'} unix charset = $sambasettings{'UNIXCHARSET'} security = $sambasettings{'SECURITY'} -encrypt passwords = yes guest account = $sambasettings{'GUESTACCOUNT'} unix password sync = $sambasettings{'PASSWORDSYNC'} -null passwords = yes bind interfaces only = true interfaces = $sambasettings{'INTERFACES'} diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh index 1cd6a1156..8b61298d5 100644 --- a/src/paks/samba/install.sh +++ b/src/paks/samba/install.sh @@ -36,6 +36,8 @@ restore_backup ${NAME} # Migrate configuration from Samba 3.6 to 4.x sed -i /var/ipfire/samba/smb.conf \ -e "/^display charset =/d" \ + -e "/^encrypt passwords =/d" \ + -e "/^null passwords =/d" \ -e "/^socket options =/d" \ -e "/^syslog/d" \ -e "s/^security = share$/security = user/" From patchwork Tue Oct 13 16:07:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3534 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSs1Tj2z3x1S for ; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSk39DMz1G6; Tue, 13 Oct 2020 16:08:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSh704Fz3056; Tue, 13 Oct 2020 16:08:20 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSg0R9fz2xb4 for ; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSf2rNmzlb; Tue, 13 Oct 2020 16:08:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wtl6sf/Ch7XYFukedrR5FaZAcprjP7xMbJegj43+3nM=; b=FTr/rH5gicyGClVWZvSH3q3VDuLH1mxMNQ8B4oCcAnb+9XJpNM+LvgPDngCDZBBYFgsmM0 ViLMTIGYJElVnXDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wtl6sf/Ch7XYFukedrR5FaZAcprjP7xMbJegj43+3nM=; b=Y7rze8vR8iSI5XgXltkEX0svdq+wbIi7Tqo8YxZ9GY+0hpxbulwb1tpt7UQlKaPSIfyWF+ PO6JFnaYWHwZPR+2N2ShH3O+uSze52TP6Es9OpvfL3xB9buUSJnyXS9pfY0BxsRhGgTK34 LzIpBsb9FyKusFGDf683LeYhDlOATv7IhGiN7NBEAdEAcnkaHvQUxsEk5pB6EHl7BAuCAC VtEfbfmp2t5N8F82CRizo3VBe93MipeE9u4D6/R1Ol7lzYlH1p3WxWf8nSoJN5dZhwvFJ+ wwWZMrcNbl3NwXAUFRs8JIlWLdkWmQIyJ7gJNvNG82fJQO+bEWox+pGmNzFk1w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 09/54] samba: Remove any options left to default value in global section Date: Tue, 13 Oct 2020 16:07:27 +0000 Message-Id: <20201013160812.27754-9-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/samba/default.global | 17 +---------------- html/cgi-bin/samba.cgi | 8 +------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/config/samba/default.global b/config/samba/default.global index 30587e47a..05d09a9a2 100644 --- a/config/samba/default.global +++ b/config/samba/default.global @@ -6,14 +6,9 @@ server string = Samba workgroup = homeip.net passdb backend = smbpasswd -keep alive = 30 os level = 33 -fstype = NTFS -kernel oplocks = false map to guest = bad user -smb ports = 445 139 -unix charset = CP850 security = user guest account = samba @@ -21,16 +16,6 @@ unix password sync = false bind interfaces only = true interfaces = green0 127.0.0.1 -socket options = TCP_NODELAY SO_KEEPALIVE -username level = 1 -wins support = true - -log file = /var/log/samba/samba-log.%m -lock directory = /var/lock/samba -pid directory = /var/run/ +log file = /var/log/samba/samba-log.%m log level = 3 passdb:5 auth:5 winbind:2 - -preferred master = false -domain master = false -local master = false diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index fd43afd17..07665e8f1 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -283,13 +283,9 @@ if ($sambasettings{'SMB2'} eq 'on'){ } print FILE < X-Patchwork-Id: 3536 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSt3T1bz3x5t for ; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSk4d4jz1Gv; Tue, 13 Oct 2020 16:08:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSj0YqMz3059; Tue, 13 Oct 2020 16:08:21 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSg1554z301n for ; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSg07wYzvc; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mWBEVyDuFQ5NHRx8DN4vj0AsGHje9PRpFomkS8ZFD2k=; b=Bz6xvSLo9tVV2IsbSa0PYQkfW2a6h8NwaJxqZzUAhd/B9fB3//lYOwm9I9ndhdpHS5NPK+ CmnH4zq2IsZeSeDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mWBEVyDuFQ5NHRx8DN4vj0AsGHje9PRpFomkS8ZFD2k=; b=cCjRL1NMsES2ZOOCcmDaQQoLDL3HP/alAKHH3fFQBFK1PjV6heFdxrzTcFnP209oybtIaG YDkbv/lCKLAtY8v8YIdi7ch6K6cboMhKr6ZsaDISxSFdfN6YR9DW57LyfrD1Nc9ub3Xyjf fMRULowvUCXLxeHsdU/Pc3uYI4V8njlMJRf684LFjyGTzJRGPs1vpQybbxtbo/QGkcdNF3 vUgrZfSOqDop6OFaNcla0ddgUfFCMK8I/qsBPtcxg6kP0R6Zbpcm4kW/TS85cpaBOOwL8b wTbab+0M6JAq9s+XAxKLLkQdJ4ZWpmtmSJTD1m9weTAWvL5LhftZQRx2MzvRFg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 10/54] sambactrl: Remove unused reset command Date: Tue, 13 Oct 2020 16:07:28 +0000 Message-Id: <20201013160812.27754-10-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- src/misc-progs/sambactrl.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c index 45c166d46..138a0b84f 100644 --- a/src/misc-progs/sambactrl.c +++ b/src/misc-progs/sambactrl.c @@ -56,10 +56,6 @@ int main(int argc, char *argv[]) { safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/default.shares > /var/ipfire/samba/smb.conf"); safe_system("/bin/cat /var/ipfire/samba/default.shares > /var/ipfire/samba/shares"); - } else if (strcmp(argv[1], "smbprinterreset") == 0) { - safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares /var/default.printer > /var/ipfire/samba/smb.conf"); - safe_system("/bin/cat /var/ipfire/samba/default.printer > /var/ipfire/samba/printer"); - } else if (strcmp(argv[1], "smbstop") == 0) { safe_system("/etc/rc.d/init.d/samba stop >/dev/null"); safe_system("/usr/local/bin/sambactrl disable"); From patchwork Tue Oct 13 16:07:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3538 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSw2GxSz3x3M for ; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSl2X0pz1CR; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSj1CkPz305D; Tue, 13 Oct 2020 16:08:21 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSg1q7lz303l for ; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSg0pgxz19Q; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ftaa88AyPut/qkbVNi04sEyPRYKiVSbgvA7FLRaiwOs=; b=zjO3hBBnlHc8GNQZgi6VkWJd32D8qdi13x4gTeJafCtQ+TtPa5wrN/3FxAPWrQFRB9pmr5 5lfnfsJknepZHmCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ftaa88AyPut/qkbVNi04sEyPRYKiVSbgvA7FLRaiwOs=; b=rnRy+lzSF2RRMNEAVnLb+vL2zd69byLX3juEQ/o774thREU0R6FCexh5AALO71HdC9ndJl ddL5u1NiCadVuBksFydrEPBezQfFk25COTphHS0d0hJN7Wm/YL1CdXklYYKEzmguG/kNA1 iT/D4HXDuptSTmqyV9UytZ11TmNICTkjX+uDN93G73ivV2FD9snzCxSTSzMPmdKPtExw2I iOzvcuLpUwi/i1TY88ZRTDGX8mZVJuF5qjnS71+8olD7fSZDVwLCoJ1ZKUp2iYKhGJryuO 9XQTnURb+Hqfy/6hcdoBksOa+brt4dmN6NncGBTneU/HwiwFdlYOEjWJ/pS89g== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 11/54] samba: Drop outdated character set settings Date: Tue, 13 Oct 2020 16:07:29 +0000 Message-Id: <20201013160812.27754-11-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 8 -------- 1 file changed, 8 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 07665e8f1..a36f34272 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -93,8 +93,6 @@ $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; -$sambasettings{'DOSCHARSET'} = 'CP850'; -$sambasettings{'UNIXCHARSET'} = 'UTF8'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; $sambasettings{'SMB2'} = 'on'; @@ -161,8 +159,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; - $sambasettings{'DOSCHARSET'} = 'CP850'; - $sambasettings{'UNIXCHARSET'} = 'UTF8'; ### Samba CUPS Variablen $sambasettings{'LOADPRINTERS'} = 'Yes'; $sambasettings{'PRINTING'} = 'cups'; @@ -286,8 +282,6 @@ print FILE <$Lang::tr{'basic options'} $Lang::tr{'workgroup'} $Lang::tr{'netbios name'} -$Lang::tr{'dos charset'} -$Lang::tr{'unix charset'} $Lang::tr{'server string'} $Lang::tr{'log level'} $Lang::tr{'interfaces'}on / From patchwork Tue Oct 13 16:07:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3537 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSv0bbVz3x1S for ; Tue, 13 Oct 2020 16:08:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSl36k0z1H4; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSj1p2sz305H; Tue, 13 Oct 2020 16:08:21 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSg2Yx6z304Q for ; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSg1Vmxzlb; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=klBupoxBdGGOsvBpbblrM+ihfCJDOBKVSWG4gtkwx50=; b=gA0E5McPZn/IoZByzFzf2vEJ8ljwz4ewHbv+IrThEhUXgzaIMGhGdaIpzxDhGi2Hf7+Ke5 UDxCrlmvAhF1qdDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=klBupoxBdGGOsvBpbblrM+ihfCJDOBKVSWG4gtkwx50=; b=JbnEWm1bdj/YwW2hSGcd8rbQ1Kk/xk90Iwx3ujbMgwmhcYJkhMjFqXpIMNFFG9mCM5pKP+ jj0zirgcy6Y4tLs7/GW4ZgfDYWx6ZoLniKbHxS83PfV4Zh6EXVl+NxPIErLl5y8a/CPZzY ZT9iSnJaQnLYhQSC3l1WCKOK0aoB1hjULIlkbm8ZspjAX48fOYYJXnksNTFO6MUgEBWdKk qtZ1FfDq6QfA5VIWIzFWSKZIyX76QbqZlaQrGV4DrEFlvdrR8kEbXcJxVcC0X8KGp6keuC C7fQAyjAR1jFdXTaJkr4hKkRjRUO3z6BKQ1dUhtIzN7zIgCWwP1XGwS5YGCAKQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 12/54] samba: Hard-code server string Date: Tue, 13 Oct 2020 16:07:30 +0000 Message-Id: <20201013160812.27754-12-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index a36f34272..5a97b291d 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -76,7 +76,6 @@ my %servicenames = ('SMB Daemon' => 'smbd', 'NetBIOS Nameserver' => 'nmbd', 'Win $sambasettings{'WORKGRP'} = 'homeip.net'; $sambasettings{'NETBIOSNAME'} = 'IPFire'; -$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'user'; $sambasettings{'OSLEVEL'} = '33'; @@ -142,7 +141,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') system("/usr/local/bin/sambactrl smbglobalreset"); $sambasettings{'WORKGRP'} = 'homeip.net'; $sambasettings{'NETBIOSNAME'} = 'IPFire'; - $sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'user'; $sambasettings{'OSLEVEL'} = '65'; @@ -263,8 +261,9 @@ print FILE <$Lang::tr{'basic options'} $Lang::tr{'workgroup'} $Lang::tr{'netbios name'} -$Lang::tr{'server string'} $Lang::tr{'log level'} $Lang::tr{'interfaces'}on / off | From patchwork Tue Oct 13 16:07:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3539 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSw5dSQz3x69 for ; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSl3pmFz1H8; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSj2PY9z3051; Tue, 13 Oct 2020 16:08:21 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSg3KqYz304X for ; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSg2D9vzvc; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dOpNVYl4g2RjlsDmBAO/vX16VATGhvnOqXDgYsbCFjA=; b=swu1KIBK2OF+hU7JEhnmXqyqSuMVE7JTgNHCv/7+zKKY74yn5EVOpVtxpVvJZ/Rm3xbcOF m1S2wIxf9a8UpCBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dOpNVYl4g2RjlsDmBAO/vX16VATGhvnOqXDgYsbCFjA=; b=CZ0HOAgEeNb0RAUWrJvPOriuBGTL5wWFdvzoO4nS0svxIN3ZgH+mIjsDXmKVe8MiL8RIDE BZK85VnP5kI4jvIkt5ittfgj3d8lLCD7xpYeLeirqj+M8EYHwKXOY+/StGtWiJRBwu776D JDVd1QvvmJlDFYtHRTRGzrNbvm7rSG8AOOOrlAy8TZYf+tNq+du2laLiV+M9X5h/TwGgCf ZAh4L/5G39txpyUalmnxHl9IuK7WvlGukB16uitjetHRlnj4lUoLa+k5H5JozCACpEhlTt R+uJzYNMmOwrCMZfyh3lR+K8K4FT0xLzA25d9R3pD71M99Q4FIc6g6NvOZhnvg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 13/54] samba: Drop netbios name option Date: Tue, 13 Oct 2020 16:07:31 +0000 Message-Id: <20201013160812.27754-13-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" It makes no sense that the same server has different host names Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 5a97b291d..0beb24241 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -75,7 +75,6 @@ my %servicenames = ('SMB Daemon' => 'smbd', 'NetBIOS Nameserver' => 'nmbd', 'Win #################################### Initialisierung von Samba Variablen fr global Settings ############################### $sambasettings{'WORKGRP'} = 'homeip.net'; -$sambasettings{'NETBIOSNAME'} = 'IPFire'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'user'; $sambasettings{'OSLEVEL'} = '33'; @@ -140,7 +139,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') { system("/usr/local/bin/sambactrl smbglobalreset"); $sambasettings{'WORKGRP'} = 'homeip.net'; - $sambasettings{'NETBIOSNAME'} = 'IPFire'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'user'; $sambasettings{'OSLEVEL'} = '65'; @@ -263,7 +261,6 @@ print FILE < $Lang::tr{'basic options'} $Lang::tr{'workgroup'} -$Lang::tr{'netbios name'} $Lang::tr{'log level'} $Lang::tr{'interfaces'}on / off | From patchwork Tue Oct 13 16:07:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3540 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSx4HS3z3x5t for ; Tue, 13 Oct 2020 16:08:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSm0DFcz1GG; Tue, 13 Oct 2020 16:08:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSj2ztrz305N; Tue, 13 Oct 2020 16:08:21 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSg49Fvz304k for ; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSg34ZBzlb; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bwk7F3tiJgXF46TCOOBFZu3fBdjLb1zOG01yq8mHZOk=; b=Ec5PYUEOazktpI5ToDord0d8EPlXn5A+zbaafe/DX4Ri/f9ejgXC+lHESAYeQf+XK5bpnX 2mp41bazdmHfQ+Cg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bwk7F3tiJgXF46TCOOBFZu3fBdjLb1zOG01yq8mHZOk=; b=OC647qDft0kl+nv7+1fW6jWe1echf7kv3djRTxMAh4o7+mUe2sLvv4SD7iCgPf9j6nGttq g2zLlC9UlXhPyvvz2Wc4SBXICISgib6lNDkyKiKiRYe4qhgOJkDrYwApqmd9HuWfZxtDrg nWynGwfADrI9kywqhEzGGg8idx217x3XCZkfEEX0gkD2ebAYzNw2a278HCY/IjjnGXkXkc E/TIKszrhBTH37RDQQRaig/LUIgp3LTReofQ6vhsHaeiEiyX3qRK8YpDH4snEFyZw1nf4h XdCImuXYbwpMVahRh75GjyrwZiXDeK7o6uFMF2aihju75704ujSgbAAT7j9AxQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 14/54] samba: Remove limitation that server only uses SMB2 Date: Tue, 13 Oct 2020 16:07:32 +0000 Message-Id: <20201013160812.27754-14-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 0beb24241..2e0ddc7f2 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -93,7 +93,6 @@ $sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; -$sambasettings{'SMB2'} = 'on'; ### Values that have to be initialized $sambasettings{'ACTION'} = ''; ### Samba CUPS Variablen @@ -169,7 +168,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'PREFERREDMASTER'} = 'off'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; - $sambasettings{'SMB2'} = 'on'; $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; system("/usr/local/bin/sambactrl smbreload"); refreshpage(); @@ -267,14 +265,6 @@ passdb backend = smbpasswd wide links = $sambasettings{'WIDELINKS'} unix extensions = $sambasettings{'UNIXEXTENSION'} -END -; - -if ($sambasettings{'SMB2'} eq 'on'){ - print FILE "max protocol = smb2\n"; -} - -print FILE < off Unix extensionon / off -SMB2 $Lang::tr{'protocol'}on / - off
$Lang::tr{'security options'} $Lang::tr{'security'} END ; -if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"$Lang::tr{'wins server'}";} - print <$Lang::tr{'wins support'}on / - off -END -; if ($sambasettings{'SECURITY'} eq 'user') { From patchwork Tue Oct 13 16:07:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3542 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSy5Nmfz3x6D for ; Tue, 13 Oct 2020 16:08:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSm5rnXz1Hf; Tue, 13 Oct 2020 16:08:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSj4BDzz304t; Tue, 13 Oct 2020 16:08:21 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSg6Y4tz2xBf for ; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSg4ctKzlb; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FZexVCd0VCVFhTzZsQ377XmzmMv/QqZEMM2dvenYZvM=; b=Pvj0lm/7Q/6SoqFdFooySG7POTfgKsesbs11F40fB2h//5OIxbI68gQ/oenx0PUPwhWj8C eAOYifcstBmLNmBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FZexVCd0VCVFhTzZsQ377XmzmMv/QqZEMM2dvenYZvM=; b=cM0pF2IRRBC+6xeR3ULGYWveeODIwlurS3GO9aNBrFDHkTKleyQRQgH9pw1DTtQ9n4Gm6O lGFdJZBa2XR9JpysVLu1djkC/U5B4fhnxzxJg6y0Sg65jP/8xSjz2SniZ9yWYKTYRMx/XJ FD/aM5CJCuqmlw1DJ1WX5VCYw7MFZ+OeAbowhXhJkfC7GN+Oyy2UwO5IleyFHXTFpp1WCO /fg5Z/RA+fUDhDLjVLLOgqdKn7UEPuAsBiPNZG2PUlLQKaLzBUbe3ofQqhIl/ZQU9rqyhg zxEfoMFcVqsPlD/5eY9n/P4tRdTpH6cffAYfp0tt1LcPRzplQUkTePZ1/rFTQw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 16/54] samba: Log to syslog Date: Tue, 13 Oct 2020 16:07:34 +0000 Message-Id: <20201013160812.27754-16-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/core/152/filelists/files | 1 + config/rootfiles/packages/aarch64/samba | 1 - config/rootfiles/packages/armv5tel/samba | 1 - config/rootfiles/packages/i586/samba | 1 - config/rootfiles/packages/x86_64/samba | 1 - html/cgi-bin/logs.cgi/log.dat | 2 + html/cgi-bin/samba.cgi | 46 +---------------------- lfs/samba | 1 - 8 files changed, 5 insertions(+), 49 deletions(-) diff --git a/config/rootfiles/core/152/filelists/files b/config/rootfiles/core/152/filelists/files index ceb904c64..aaf469bce 100644 --- a/config/rootfiles/core/152/filelists/files +++ b/config/rootfiles/core/152/filelists/files @@ -9,5 +9,6 @@ etc/rc.d/helper/oci-setup etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/red srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat usr/local/bin/setaliases var/ipfire/graphs.pl diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index 630ec9da8..a707895d9 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -812,7 +812,6 @@ var/lib/samba var/lib/samba/bind-dns var/lib/samba/private var/lib/samba/winbindd_privileged -var/log/samba var/nmbd srv/web/ipfire/cgi-bin/samba.cgi srv/web/ipfire/cgi-bin/sambahlp.cgi diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba index 51349093b..885d9e154 100644 --- a/config/rootfiles/packages/armv5tel/samba +++ b/config/rootfiles/packages/armv5tel/samba @@ -812,7 +812,6 @@ var/lib/samba var/lib/samba/bind-dns var/lib/samba/private var/lib/samba/winbindd_privileged -var/log/samba var/nmbd srv/web/ipfire/cgi-bin/samba.cgi srv/web/ipfire/cgi-bin/sambahlp.cgi diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba index 089f6981d..e942471e2 100644 --- a/config/rootfiles/packages/i586/samba +++ b/config/rootfiles/packages/i586/samba @@ -812,7 +812,6 @@ var/lib/samba var/lib/samba/bind-dns var/lib/samba/private var/lib/samba/winbindd_privileged -var/log/samba var/nmbd srv/web/ipfire/cgi-bin/samba.cgi srv/web/ipfire/cgi-bin/sambahlp.cgi diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index ff2b7d5c3..1c31256db 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -812,7 +812,6 @@ var/lib/samba var/lib/samba/bind-dns var/lib/samba/private var/lib/samba/winbindd_privileged -var/log/samba var/nmbd srv/web/ipfire/cgi-bin/samba.cgi srv/web/ipfire/cgi-bin/sambahlp.cgi diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 8ca32d675..1fec05c35 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -67,6 +67,7 @@ my %sections = ( 'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )', 'pakfire' => '(pakfire:)', 'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])', + 'samba' => '(nmbd|smbd|winbind)\[\d+\]:', 'suricata' => '(suricata: )', 'squid' => '(squid\[.*\]: |squid: )', 'ssh' => '(sshd(?:\(.*\))?\[.*\]: )', @@ -95,6 +96,7 @@ my %trsections = ( 'openvpn' => 'OpenVPN', 'pakfire' => 'Pakfire', 'red' => 'RED', + 'samba' => $Lang::tr{'samba'}, 'suricata' => "$Lang::tr{'intrusion detection'}", 'squid' => "$Lang::tr{'web proxy'}", 'ssh' => 'SSH', diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 4668cd253..0510f0f24 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -38,9 +38,6 @@ my %mainsettings = (); my $message = ""; my $errormessage = ""; -my @Logs = qx(ls /var/log/samba/); -my $Log =$Lang::tr{'no log selected'}; - my $Status = qx(/usr/local/bin/sambactrl smbstatus); $Status = &Header::cleanhtml($Status); @@ -88,7 +85,6 @@ $sambasettings{'PASSWORDSYNC'} = 'off'; $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Bad User'; -$sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; ### Values that have to be initialized @@ -149,7 +145,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Bad User'; - $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; ### Samba CUPS Variablen $sambasettings{'LOADPRINTERS'} = 'Yes'; $sambasettings{'PRINTING'} = 'cups'; @@ -278,8 +273,8 @@ winbind uid = 10000-20000 winbind gid = 10000-20000 winbind use default domain = yes -log file = /var/log/samba/samba-log.%m -log level = $sambasettings{'LOGLEVEL'} +# Log to syslog +logging = syslog preferred master = $sambasettings{'PREFERREDMASTER'} domain master = $sambasettings{'DOMAINMASTER'} @@ -427,7 +422,6 @@ print < $Lang::tr{'basic options'} $Lang::tr{'workgroup'} -$Lang::tr{'log level'} $Lang::tr{'interfaces'}on / off | OpenVpn - $ovpnip[0].$ovpnip[1].$ovpnip[2].$ovpnip[3]/$ovpnnetwork[1] @@ -1147,42 +1141,6 @@ END ; &Header::closebox(); -############################################################################################################################ -############################################### Anzeige der Sambalogs ###################################################### - - -if ($sambasettings{'ACTION'} eq 'showlog') -{ -$Log = qx(tail -n $sambasettings{'LOGLINES'} /var/log/samba/$sambasettings{'LOG'}); -$Log=~s/\n/
/g; -} - -&Header::openbox('100%', 'center', $Lang::tr{'log'}); - -print < -
-
- - - - - - - - - -
$Lang::tr{'log view'}

$Lang::tr{'show last x lines'}

$Log

$sambasettings{'LOG'}
-
-END -; -&Header::closebox(); &Header::closebigbox(); &Header::closepage(); diff --git a/lfs/samba b/lfs/samba index 874166d2e..cd20baffc 100644 --- a/lfs/samba +++ b/lfs/samba @@ -109,7 +109,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf rm -rf /var/lib/samba/private ln -s /var/ipfire/samba/private /var/lib/samba/private - -mkdir -p /var/log/samba install -v -m 644 $(DIR_SRC)/config/backup/includes/samba /var/ipfire/backup/addons/includes/samba -mkdir -p /var/lib/samba/winbindd_privileged From patchwork Tue Oct 13 16:07:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3543 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gT03lzqz3x3M for ; Tue, 13 Oct 2020 16:08:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSn5cHfz1GV; Tue, 13 Oct 2020 16:08:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSl4pGcz2yp9; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSh4RcVz2xb8 for ; Tue, 13 Oct 2020 16:08:20 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSg5lS2z1G6; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2sTvogCm/Wdo2AQ8cYYn+bHmb+ncBx6WgLS2BtwMqkA=; b=M1cOhYtUtaHqOOb0yc2wKUfizUEg1RClkstG3+Xt5IYo63ezDyX047iF1i5f8ldyTGTaBj sua5Wx5l1606SmDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2sTvogCm/Wdo2AQ8cYYn+bHmb+ncBx6WgLS2BtwMqkA=; b=UJwB1atCqF1W1S8xv2Gj8bT+Zc+4+wgkbwEfoT7phZ6Q5nIbPLPVqT/ryXc4pLRvW1WqIp 4Z92/tsTNw04XIOLdMINTKBPauEchXOX1OjqPlSvTjNJuacD51E673d8IjaQkwV3qxI4rK RMkE2ojUVLZ+9Spfw10KjCAc31E/sCmfuMbxVm8bvDWZyk/iFQLHk9LvEHxUgqHLIkTk8E U8/sUzUNgoyeXgvUFXvJcA3C8GmgAybYxJ9KaPJ6RkRNkWBH9f+KSx5s2OQKThScISp+fM gZHjEEQV/AKncVsXFH5zSuuuFnBCwrl1oqAbm4r2E44wTQTgrZ/XrQ4ptkTFvg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 17/54] samba: Remove reset options Date: Tue, 13 Oct 2020 16:07:35 +0000 Message-Id: <20201013160812.27754-17-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This only requires that we have to change multiple files with the same settings. Signed-off-by: Michael Tremer --- config/rootfiles/packages/aarch64/samba | 5 -- config/rootfiles/packages/armv5tel/samba | 5 -- config/rootfiles/packages/i586/samba | 5 -- config/rootfiles/packages/x86_64/samba | 5 -- config/samba/{default.global => global} | 0 config/samba/{default.pdc => pdc} | 0 config/samba/{default.printer => printer} | 0 config/samba/{default.settings => settings} | 0 config/samba/{default.shares => shares} | 0 html/cgi-bin/samba.cgi | 93 --------------------- lfs/samba | 5 -- src/misc-progs/sambactrl.c | 10 --- 12 files changed, 128 deletions(-) rename config/samba/{default.global => global} (100%) rename config/samba/{default.pdc => pdc} (100%) rename config/samba/{default.printer => printer} (100%) rename config/samba/{default.settings => settings} (100%) rename config/samba/{default.shares => shares} (100%) diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index a707895d9..3bef0733e 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -793,11 +793,6 @@ usr/sbin/smbd usr/sbin/winbindd var/ipfire/backup/addons/includes/samba #var/ipfire/samba -var/ipfire/samba/default.global -var/ipfire/samba/default.pdc -var/ipfire/samba/default.printer -var/ipfire/samba/default.settings -var/ipfire/samba/default.shares var/ipfire/samba/global var/ipfire/samba/pdc var/ipfire/samba/printer diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba index 885d9e154..f58d4fc2f 100644 --- a/config/rootfiles/packages/armv5tel/samba +++ b/config/rootfiles/packages/armv5tel/samba @@ -793,11 +793,6 @@ usr/sbin/smbd usr/sbin/winbindd var/ipfire/backup/addons/includes/samba #var/ipfire/samba -var/ipfire/samba/default.global -var/ipfire/samba/default.pdc -var/ipfire/samba/default.printer -var/ipfire/samba/default.settings -var/ipfire/samba/default.shares var/ipfire/samba/global var/ipfire/samba/pdc var/ipfire/samba/printer diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba index e942471e2..e74caeea0 100644 --- a/config/rootfiles/packages/i586/samba +++ b/config/rootfiles/packages/i586/samba @@ -793,11 +793,6 @@ usr/sbin/smbd usr/sbin/winbindd var/ipfire/backup/addons/includes/samba #var/ipfire/samba -var/ipfire/samba/default.global -var/ipfire/samba/default.pdc -var/ipfire/samba/default.printer -var/ipfire/samba/default.settings -var/ipfire/samba/default.shares var/ipfire/samba/global var/ipfire/samba/pdc var/ipfire/samba/printer diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index 1c31256db..c91252a30 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -793,11 +793,6 @@ usr/sbin/smbd usr/sbin/winbindd var/ipfire/backup/addons/includes/samba #var/ipfire/samba -var/ipfire/samba/default.global -var/ipfire/samba/default.pdc -var/ipfire/samba/default.printer -var/ipfire/samba/default.settings -var/ipfire/samba/default.shares var/ipfire/samba/global var/ipfire/samba/pdc var/ipfire/samba/printer diff --git a/config/samba/default.global b/config/samba/global similarity index 100% rename from config/samba/default.global rename to config/samba/global diff --git a/config/samba/default.pdc b/config/samba/pdc similarity index 100% rename from config/samba/default.pdc rename to config/samba/pdc diff --git a/config/samba/default.printer b/config/samba/printer similarity index 100% rename from config/samba/default.printer rename to config/samba/printer diff --git a/config/samba/default.settings b/config/samba/settings similarity index 100% rename from config/samba/default.settings rename to config/samba/settings diff --git a/config/samba/default.shares b/config/samba/shares similarity index 100% rename from config/samba/default.shares rename to config/samba/shares diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 0510f0f24..31751ff4c 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -128,85 +128,10 @@ if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl s if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");refreshpage();} if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");refreshpage();} if ($sambasettings{'ACTION'} eq 'smbreload'){system("/usr/local/bin/sambactrl smbreload");refreshpage();} -if ($sambasettings{'ACTION'} eq 'globalresetyes') - { - system("/usr/local/bin/sambactrl smbglobalreset"); - $sambasettings{'WORKGRP'} = 'homeip.net'; - $sambasettings{'INTERFACES'} = ''; - $sambasettings{'SECURITY'} = 'user'; - $sambasettings{'OSLEVEL'} = '65'; - $sambasettings{'GREEN'} = 'on'; - $sambasettings{'BLUE'} = 'off'; - $sambasettings{'ORANGE'} = 'off'; - $sambasettings{'VPN'} = 'off'; - $sambasettings{'REMOTEANNOUNCE'} = ''; - $sambasettings{'REMOTESYNC'} = ''; - $sambasettings{'PASSWORDSYNC'} = 'off'; - $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; - $sambasettings{'GUESTACCOUNT'} = 'samba'; - $sambasettings{'MAPTOGUEST'} = 'Bad User'; -### Samba CUPS Variablen - $sambasettings{'LOADPRINTERS'} = 'Yes'; - $sambasettings{'PRINTING'} = 'cups'; - $sambasettings{'PRINTCAPNAME'} = 'cups'; - $sambasettings{'PRINTERNAME'} = 'Printer'; -### Values that have to be initialized - $sambasettings{'WIDELINKS'} = 'on'; - $sambasettings{'UNIXEXTENSION'} = 'off'; - $sambasettings{'ACTION'} = ''; - $sambasettings{'LOCALMASTER'} = 'off'; - $sambasettings{'DOMAINMASTER'} = 'off'; - $sambasettings{'PREFERREDMASTER'} = 'off'; - $sambasettings{'WIDELINKS'} = 'on'; - $sambasettings{'UNIXEXTENSION'} = 'off'; - $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; - system("/usr/local/bin/sambactrl smbreload"); - refreshpage(); - } - if ($sambasettings{'ACTION'} eq 'join') { $message .= &joindomain($sambasettings{'USERNAME'}, $sambasettings{'PASSWORD'}); } -############################################################################################################################ -################################################ Sicherheitsabfrage für den Reset ########################################## - -if ($sambasettings{'ACTION'} eq 'globalreset') - { - print < - - - - -
$Lang::tr{'resetglobals'} -
- $Lang::tr{'yes'} -
- $Lang::tr{'no'} -
-END -; -} - -if ($sambasettings{'ACTION'} eq 'sharesreset') - { - print < - - - - -
$Lang::tr{'resetshares'} -
- $Lang::tr{'yes'} -
- $Lang::tr{'no'} -
-END -; - } - ############################################################################################################################ ########################################### Samba Benutzer oder PC l�chen ################################################# @@ -526,9 +451,6 @@ print <
-
- -
@@ -906,10 +828,6 @@ print < -
- - -
@@ -928,7 +846,6 @@ if ($sambasettings{'ACTION'} eq 'sharecaption') $Lang::tr{'add share'} $Lang::tr{'edit share'} $Lang::tr{'save config'} - $Lang::tr{'reset shares'} $Lang::tr{'delete share'} END @@ -976,12 +893,6 @@ END ; } -if ($sambasettings{'ACTION'} eq 'sharesresetyes') - { - system('/usr/local/bin/sambactrl smbsharesreset'); - my $shares = config("${General::swroot}/samba/shares"); - system("/usr/local/bin/sambactrl smbreload"); - } if ($sambasettings{'ACTION'} eq 'smbshareadd') { $shares{'xvx'}= "$sambasettings{'SHAREOPTION'}"; @@ -1047,10 +958,6 @@ print < -
- - -
diff --git a/lfs/samba b/lfs/samba index cd20baffc..5c527b257 100644 --- a/lfs/samba +++ b/lfs/samba @@ -101,11 +101,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/source3 && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/ chown nobody:nobody -R /var/ipfire/samba/ - cp -vfp /var/ipfire/samba/default.global /var/ipfire/samba/global - cp -vfp /var/ipfire/samba/default.pdc /var/ipfire/samba/pdc - cp -vfp /var/ipfire/samba/default.settings /var/ipfire/samba/settings - cp -vfp /var/ipfire/samba/default.shares /var/ipfire/samba/shares - cp -vfp /var/ipfire/samba/default.printer /var/ipfire/samba/printer cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf rm -rf /var/lib/samba/private ln -s /var/ipfire/samba/private /var/lib/samba/private diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c index 138a0b84f..2724bfc34 100644 --- a/src/misc-progs/sambactrl.c +++ b/src/misc-progs/sambactrl.c @@ -46,16 +46,6 @@ int main(int argc, char *argv[]) { } else if (strcmp(argv[1], "smbsafeconfpdccups") == 0) { safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf"); - } else if (strcmp(argv[1], "smbglobalreset") == 0) { - safe_system("/bin/cat /var/ipfire/samba/default.global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf"); - safe_system("/bin/cat /var/ipfire/samba/default.settings > /var/ipfire/samba/settings"); - safe_system("/bin/cat /var/ipfire/samba/default.global > /var/ipfire/samba/global"); - safe_system("/bin/cat /var/ipfire/samba/default.pdc > /var/ipfire/samba/pdc"); - - } else if (strcmp(argv[1], "smbsharesreset") == 0) { - safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/default.shares > /var/ipfire/samba/smb.conf"); - safe_system("/bin/cat /var/ipfire/samba/default.shares > /var/ipfire/samba/shares"); - } else if (strcmp(argv[1], "smbstop") == 0) { safe_system("/etc/rc.d/init.d/samba stop >/dev/null"); safe_system("/usr/local/bin/sambactrl disable"); From patchwork Tue Oct 13 16:07:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3544 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gT1015xz3x5t for ; Tue, 13 Oct 2020 16:08:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSp1hDsz1Ht; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSl5MWFz304W; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSk0Y8Yz2xkD for ; Tue, 13 Oct 2020 16:08:22 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSh32ywz1GD; Tue, 13 Oct 2020 16:08:20 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l3kAWNkzaHqmvtbL3Da+GiTI/AHhkeHUIGq5EXYM0V4=; b=lUoV2kvhompdTgyI6ZzOuQHSeYHnhVQDKUftri/uVntBGYfgPnGnx6LSeNb3RSzvDV/1Nj +k6g4Osg4JDA1PCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l3kAWNkzaHqmvtbL3Da+GiTI/AHhkeHUIGq5EXYM0V4=; b=fpIHm60HNbLOPZ9yoOc9TeqJFGXY67LFUbYdWfxaox1+FJr9D/2d03MBp17UEIFZ+BwRqp t3U01M+eLUv2CVLQsZ23OX7Lg9f6JgaqZCIshkxhpS4RTB2zRkipzWKQ7WmNhVFTTOradJ FxQ8vvInGAvUJpiPnhLPqxs0Izb3aSVcH5T8lqKHIF9/B7lOtIzHL/aWARnNlavA/l5Yb2 E3FXB1RyiX9T3mkhSaCtoW//6yXFv/35KsbRpHAn0xqK1bYqmab8cCog7SWdaBjBvWdDfh Etg4GPFI0x6dcbw2JNeKUvURuRgWVn5ehi0NTVhPQefZsFRZ4ym+muau+0ilBg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 18/54] samba: Remove help popup Date: Tue, 13 Oct 2020 16:07:36 +0000 Message-Id: <20201013160812.27754-18-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is outdated and should be put into the wiki. It is also some very ugly JS. Signed-off-by: Michael Tremer --- config/rootfiles/common/web-user-interface | 1 - config/rootfiles/packages/aarch64/samba | 1 - config/rootfiles/packages/armv5tel/samba | 1 - config/rootfiles/packages/i586/samba | 1 - config/rootfiles/packages/x86_64/samba | 1 - html/cgi-bin/samba.cgi | 5 -- html/cgi-bin/sambahlp.cgi | 94 ---------------------- 7 files changed, 104 deletions(-) delete mode 100644 html/cgi-bin/sambahlp.cgi diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index aa32053a2..44856fcc2 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -75,7 +75,6 @@ srv/web/ipfire/cgi-bin/qos.cgi srv/web/ipfire/cgi-bin/remote.cgi srv/web/ipfire/cgi-bin/routing.cgi #srv/web/ipfire/cgi-bin/samba.cgi -#srv/web/ipfire/cgi-bin/sambahlp.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/shutdown.cgi srv/web/ipfire/cgi-bin/speed.cgi diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index 3bef0733e..61e29fe8c 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -809,6 +809,5 @@ var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd srv/web/ipfire/cgi-bin/samba.cgi -srv/web/ipfire/cgi-bin/sambahlp.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba index f58d4fc2f..16e9dab11 100644 --- a/config/rootfiles/packages/armv5tel/samba +++ b/config/rootfiles/packages/armv5tel/samba @@ -809,6 +809,5 @@ var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd srv/web/ipfire/cgi-bin/samba.cgi -srv/web/ipfire/cgi-bin/sambahlp.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba index e74caeea0..dea9aa023 100644 --- a/config/rootfiles/packages/i586/samba +++ b/config/rootfiles/packages/i586/samba @@ -809,6 +809,5 @@ var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd srv/web/ipfire/cgi-bin/samba.cgi -srv/web/ipfire/cgi-bin/sambahlp.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index c91252a30..31328a3a0 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -809,6 +809,5 @@ var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd srv/web/ipfire/cgi-bin/samba.cgi -srv/web/ipfire/cgi-bin/sambahlp.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 31751ff4c..abf5e3295 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -859,8 +859,6 @@ if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optio -
$Lang::tr{'add share'}
$Lang::tr{'show share options'} -

@@ -880,7 +878,6 @@ if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'op -
$Lang::tr{'edit share'}
$Lang::tr{'show share options'}

@@ -975,7 +972,6 @@ if ($sambasettings{'ACTION'} eq 'printeradd' || $sambasettings{'ACTION'} eq 'pri $Lang::tr{'add printer'} $Lang::tr{'show share options'} -
@@ -996,7 +992,6 @@ if ($sambasettings{'ACTION'} eq 'printerchange' || $sambasettings{'ACTION'} eq ' -
$Lang::tr{'edit printer'}
$Lang::tr{'show share options'}

diff --git a/html/cgi-bin/sambahlp.cgi b/html/cgi-bin/sambahlp.cgi deleted file mode 100644 index 0ed099ab1..000000000 --- a/html/cgi-bin/sambahlp.cgi +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -use strict; -# enable only the following on debugging purpose -#use warnings; -#use CGI::Carp 'fatalsToBrowser'; - -require '/var/ipfire/general-functions.pl'; -require "${General::swroot}/lang.pl"; -require "${General::swroot}/header.pl"; - -&Header::showhttpheaders(); -&Header::openpagewithoutmenu('Samba', 1, ''); -&Header::openbigbox('100%', 'left', '', 'BigBox'); -&Header::openbox('100%', 'left', '', 'Sambahelp'); - - print < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
$Lang::tr{'caption'}
$Lang::tr{'options'}$Lang::tr{'meaning'} / $Lang::tr{'exampel'}
comment$Lang::tr{'comment'}
comment = $Lang::tr{'my new share'}

path$Lang::tr{'path to directory'}
path = /tmp

writeable$Lang::tr{'directory writeable'}
writeable = yes

browseablesichtbar in Verzeichnisliste
browsable = yes

userBesitzer der Freigabe
user = samba

valid usersListe der Zugriffsberechtigten
valid users = samba, user1

write list$Lang::tr{'visible in browselist'}
write list = samba

hosts allow$Lang::tr{'host allow'}
hosts allow = localhost 192.168.1.1 192.168.2.0/24

hosts deny$Lang::tr{'host deny'}
hosts deny = 192.168.1.2 192.168.3.0/24

read list$Lang::tr{'read list'}
read list = user1

admin users$Lang::tr{'admin users'}
admin users = user1

invalid users$Lang::tr{'invalid users'}
invalid users = user2

force user$Lang::tr{'force user'}
force user = samba

directory mask$Lang::tr{'directory mask'}
directory mask = 0777

create maskU$Lang::tr{'create mask'}
create mask = 0777

guest ok$Lang::tr{'guest ok'}
guest ok = yes
-END -; - -&Header::closebox(); -&Header::closebigbox(); -&Header::closepage(); From patchwork Tue Oct 13 16:07:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3545 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gT13hNKz3x69 for ; Tue, 13 Oct 2020 16:08:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSp6qkvz1Hg; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSl5xVkz304J; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSk2mLmz2y3n for ; Tue, 13 Oct 2020 16:08:22 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSj1P3fz1G6; Tue, 13 Oct 2020 16:08:21 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hY2pmnqk+3r1/0StmKxZNRowwL5QoPPQi6Evto3es/g=; b=uCFdHjA1KgjF/mOGVpi+HBeHYDSFVuVVLGBbrzK62vI1Z8BdiWMdFFYS0poXS1eZnL//G9 sTdZ4xY+fJ8pfKCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hY2pmnqk+3r1/0StmKxZNRowwL5QoPPQi6Evto3es/g=; b=gIypoodhMCK2+1vuz8fEWx7Xs3oPvbwAjMPVaNYsRjf/v4SsPnkeKSUrN8StSwmTwpjDMS qcnk4OUjhNTLhekcSE0vTTSb+DcWcjNowP1+5cEplEkrd5of4FAdEeis7aI0DrRypVlSId ayLy0ItLSjJUppp1Nkj51nNwKnADG8scgd3KV1GpVkEYenoMFpgi7WizpwMoU85i+DbvvS LoPMX5NHJOyLy8W11sE9R2Omb/yaNbf0QaQlPonc8DJ1ZW5N95F4YvagGtAGA/8TPu+w76 EtpdJzovLkeTrpVgtdm4c7vI09imOLSIWYW10/PZBFtM075lZuYUnL4APIvung== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 19/54] samba: Always show printer options Date: Tue, 13 Oct 2020 16:07:37 +0000 Message-Id: <20201013160812.27754-19-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Samba is always linked against CUPS and therefore there is no way to disable printing anyways. Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 53 ++------------------------------------ src/misc-progs/sambactrl.c | 6 ----- 2 files changed, 2 insertions(+), 57 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index abf5e3295..cd0cc8ab8 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -89,10 +89,6 @@ $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; ### Values that have to be initialized $sambasettings{'ACTION'} = ''; -### Samba CUPS Variablen -$sambasettings{'LOADPRINTERS'} = 'Yes'; -$sambasettings{'PRINTING'} = 'cups'; -$sambasettings{'PRINTCAPNAME'} = 'cups'; my $LOGLINES = '50'; ################################################## Samba PDC Variablen ##################################################### @@ -204,25 +200,11 @@ logging = syslog preferred master = $sambasettings{'PREFERREDMASTER'} domain master = $sambasettings{'DOMAINMASTER'} local master = $sambasettings{'LOCALMASTER'} - END ; close FILE; - if (-e "${General::swroot}/cups/enable"){ - open (FILE, ">>${General::swroot}/samba/global") or die "Can't save the global cups settings: $!"; - flock (FILE, 2); - print FILE <${General::swroot}/samba/pdc") or die "Can't save the pdc settings: $!"; flock (FILE, 2); @@ -239,16 +221,8 @@ END close FILE; } -if ( -e "/var/ipfire/cups/enable") - { - if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");refreshpage();} - else {system("/usr/local/bin/sambactrl smbsafeconfcups");} - } -else - { if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");refreshpage();} else{system("/usr/local/bin/sambactrl smbsafeconf");} - } system("/usr/local/bin/sambactrl smbreload");refreshpage(); } @@ -432,18 +406,6 @@ END ; } - if ( -e "/var/ipfire/cups/enable") - { - print <
- $Lang::tr{'printing options'} - $Lang::tr{'load printer'} - $Lang::tr{'printing'} - $Lang::tr{'printcap name'} -END -; - } - print <
@@ -916,8 +878,6 @@ if ($sambasettings{'ACTION'} eq 'smbsharechange') my %printer = config("${General::swroot}/samba/printer"); -if ( -e "/var/ipfire/cups/enable") -{ &Header::openbox('100%', 'center', $Lang::tr{'printer'}); my @Printers = keys(%printer); @@ -1026,7 +986,6 @@ if ($sambasettings{'ACTION'} eq 'smbprinterchange') } &Header::closebox(); -} ############################################################################################################################ ############################################### Anzeige des Sambastatus #################################################### @@ -1098,16 +1057,8 @@ if ( $smb eq 'shares') close FILE; -if ( -e "/var/ipfire/cups/enable") - { - if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");} - else {system("/usr/local/bin/sambactrl smbsafeconfcups");} - } -else - { - if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");} +if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");} else{system("/usr/local/bin/sambactrl smbsafeconf");} - } system("/usr/local/bin/sambactrl smbreload"); refreshpage(); diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c index 2724bfc34..1dcc8ee61 100644 --- a/src/misc-progs/sambactrl.c +++ b/src/misc-progs/sambactrl.c @@ -37,15 +37,9 @@ int main(int argc, char *argv[]) { } else if (strcmp(argv[1], "smbsafeconf") == 0) { safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf"); - } else if (strcmp(argv[1], "smbsafeconfcups") == 0) { - safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf"); - } else if (strcmp(argv[1], "smbsafeconfpdc") == 0) { safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf"); - } else if (strcmp(argv[1], "smbsafeconfpdccups") == 0) { - safe_system("/bin/cat /var/ipfire/samba/global /var/ipfire/samba/pdc /var/ipfire/samba/shares /var/ipfire/samba/printer > /var/ipfire/samba/smb.conf"); - } else if (strcmp(argv[1], "smbstop") == 0) { safe_system("/etc/rc.d/init.d/samba stop >/dev/null"); safe_system("/usr/local/bin/sambactrl disable"); From patchwork Tue Oct 13 16:07:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3546 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTG728dz3x1S for ; Tue, 13 Oct 2020 16:08:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSs0T6wz1KH; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSp0Lrrz305F; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSk5M03z2xBf for ; Tue, 13 Oct 2020 16:08:22 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSj4Rrvz1GW; Tue, 13 Oct 2020 16:08:21 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zU1mx3gH2Cb9/+V6AEvoV+d7MpV59qVMp2Nh+wxTG64=; b=K8SbRU56zM5/EHcqnKjPzLuzPt+ruvS2grZ4OnV1tkO1oYxH81U/VsUWzvHFHJdmnyFenU tX6iOCdl5FMDNEDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zU1mx3gH2Cb9/+V6AEvoV+d7MpV59qVMp2Nh+wxTG64=; b=CLE6EqGk9JQDr9iDRsFcHGbWweD/dIZazmX6vJuhmKFjq7Vw/k1EdPs4QsBb5kMhEIWT6n sciS+WRikTuvVLj0JQ5PtC9uVm1Bw2jELQbPkpuUFVjdaCeYcyuQiAwT6iLyEFbuQavNEg Pt7owlFRvV61Jd9A0CCvK6K5I4yFpADvfhmeRSHGFq4s6TQhliG+F8TaqCKNFKCVbGw/Dk nc05XrI4Q24Q/q/K3cIs/2eCT33ZXf6fkcL3bleV/6UjA7AQ2D15E6v5IXuzd0cbFQP3dk C1sy13ji9s3cP/eka/lxN2+/OcUKz8leaKMMZnQUsAUE4un7SrzOKyeiUU3MnQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 20/54] samba: Remove printer management Date: Tue, 13 Oct 2020 16:07:38 +0000 Message-Id: <20201013160812.27754-20-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/backup/includes/samba | 1 - config/rootfiles/packages/aarch64/samba | 1 - config/rootfiles/packages/armv5tel/samba | 1 - config/rootfiles/packages/i586/samba | 1 - config/rootfiles/packages/x86_64/samba | 1 - html/cgi-bin/samba.cgi | 119 ----------------------- 6 files changed, 124 deletions(-) diff --git a/config/backup/includes/samba b/config/backup/includes/samba index 67823bd19..1d2166ca5 100644 --- a/config/backup/includes/samba +++ b/config/backup/includes/samba @@ -1,6 +1,5 @@ /var/ipfire/samba/global /var/ipfire/samba/pdc -/var/ipfire/samba/printer /var/ipfire/samba/private/ /var/ipfire/samba/settings /var/ipfire/samba/shares diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index 61e29fe8c..ad5ffb204 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -795,7 +795,6 @@ var/ipfire/backup/addons/includes/samba #var/ipfire/samba var/ipfire/samba/global var/ipfire/samba/pdc -var/ipfire/samba/printer #var/ipfire/samba/private var/ipfire/samba/private/secrets.tdb var/ipfire/samba/private/smbpasswd diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba index 16e9dab11..9d445db8f 100644 --- a/config/rootfiles/packages/armv5tel/samba +++ b/config/rootfiles/packages/armv5tel/samba @@ -795,7 +795,6 @@ var/ipfire/backup/addons/includes/samba #var/ipfire/samba var/ipfire/samba/global var/ipfire/samba/pdc -var/ipfire/samba/printer #var/ipfire/samba/private var/ipfire/samba/private/secrets.tdb var/ipfire/samba/private/smbpasswd diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba index dea9aa023..0888fc6ed 100644 --- a/config/rootfiles/packages/i586/samba +++ b/config/rootfiles/packages/i586/samba @@ -795,7 +795,6 @@ var/ipfire/backup/addons/includes/samba #var/ipfire/samba var/ipfire/samba/global var/ipfire/samba/pdc -var/ipfire/samba/printer #var/ipfire/samba/private var/ipfire/samba/private/secrets.tdb var/ipfire/samba/private/smbpasswd diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index 31328a3a0..54afad4d2 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -795,7 +795,6 @@ var/ipfire/backup/addons/includes/samba #var/ipfire/samba var/ipfire/samba/global var/ipfire/samba/pdc -var/ipfire/samba/printer #var/ipfire/samba/private var/ipfire/samba/private/secrets.tdb var/ipfire/samba/private/smbpasswd diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index cd0cc8ab8..a9478a139 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -48,8 +48,6 @@ my $userfile = "${General::swroot}/samba/private/smbpasswd"; my %selected= () ; my $defaultoption= "[Share]\npath = /var/ipfire/samba/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\npublic = yes\nforce user = samba"; -my $defaultprinter= "[Printer]\ncomment = Printer public\npath = /var/spool/cups\nprinting = sysvn\nprintcap = lpstat\npublic = yes\nwritable = no\nprintable = yes"; -my %printer = (); my %shares = (); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); @@ -873,120 +871,6 @@ if ($sambasettings{'ACTION'} eq 'smbsharechange') &Header::closebox(); -############################################################################################################################ -################################################ Verwalten von Druckern #################################################### - -my %printer = config("${General::swroot}/samba/printer"); - -&Header::openbox('100%', 'center', $Lang::tr{'printer'}); - -my @Printers = keys(%printer); -print < -
- - -END -; -foreach my $printerentry (sort @Printers) - { - chomp $printerentry; - print < - - -END -; - } -print < -
-
$Lang::tr{'manage printers'} -
$Lang::tr{'printername'}$Lang::tr{'options'}
$printerentry - - - -
- - - -
- - - -
- - -
- - -
-END -; - -if ($sambasettings{'ACTION'} eq 'printeradd' || $sambasettings{'ACTION'} eq 'printercaption' ) - { - print < - - - - -
$Lang::tr{'add printer'}
$Lang::tr{'show share options'} -
-
- - -
-
- -END -; - } - -if ($sambasettings{'ACTION'} eq 'printerchange' || $sambasettings{'ACTION'} eq 'printercaption2' ) - { - my $printeroption = $printer{$sambasettings{'NAME'}}; - print < - - - - -
$Lang::tr{'edit printer'}
-
- - -
- -
-END -; - } - -if ($sambasettings{'ACTION'} eq 'smbprinteradd') - { - $printer{'xvx'}= "$sambasettings{'PRINTEROPTION'}"; - save("printer"); - my %printer = config("${General::swroot}/samba/printer"); - } - -if ($sambasettings{'ACTION'} eq 'smbprinterdel') - { - delete $printer{$sambasettings{'NAME'}}; - save("printer"); - my %printer = config("${General::swroot}/samba/printer"); - } - -if ($sambasettings{'ACTION'} eq 'smbprinterchange') - { - $printer{$sambasettings{'NAME'}} = $sambasettings{'PRINTEROPTION'}; - save("printer"); - my %printer = config("${General::swroot}/samba/printer"); - } - -&Header::closebox(); - ############################################################################################################################ ############################################### Anzeige des Sambastatus #################################################### @@ -1049,9 +933,6 @@ my $smb = shift; open (FILE, ">${General::swroot}/samba/$smb") or die "Can't $smb settings $!"; flock (FILE, 2); -if ( $smb eq 'printer') - {while (my ($name, $option) = each %printer){chomp $option;$option =~ s/\r\n/\n/gi;$option =~ s/^\n//gi;$option =~ s/^\r//gi;$option =~ s/^.\n//gi;$option =~ s/^.\r//gi;print FILE "$option\n";}} - if ( $smb eq 'shares') {while (my ($name, $option) = each %shares){chomp $option;$option =~ s/\r\n/\n/gi;$option =~ s/^\n//gi;$option =~ s/^\r//gi;$option =~ s/^.\n//gi;$option =~ s/^.\r//gi;print FILE "$option\n";} } From patchwork Tue Oct 13 16:07:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3547 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTQ1Pdkz3x1S for ; Tue, 13 Oct 2020 16:08:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSs0MTNz1Jq; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSp0vnTz305L; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSl2LCPz2xBf for ; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSk0hGRz1GD; Tue, 13 Oct 2020 16:08:22 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K9NbPkBDjir3chdnTbZAQIHRSqzvcHkubrC3UQHz6w4=; b=ShI96VXavjoO5YAI8z+lJdV495sw2o2FxqRcx4vKfKseq2CDBKLqKvXYUTQPbGAXAVGwc1 WqtptBaGunZTLlCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K9NbPkBDjir3chdnTbZAQIHRSqzvcHkubrC3UQHz6w4=; b=SmN/5chA8zSOsLXYjakMWDPMmpn7eYKbGt1+/zUnkA9l9rWQ82NsS3S+F19W33nkIli0nK ISnENVafQm+CJl8sNB3GSiYSeCSxLjy1NZfmthhR/6vKBD8hUdWwP3bnf7rfi1n6H0YpCg 7rr3VeKoYjF4hxL/t6+5vEOHLLtE7j2SVOh8VTu0mQDc1eOqnS3QoDpkGC4i4W1h9N6ohN SExz1+NkQbonapujf4sXKyMm2FVbwQAfhNkkk84Zv2xnjShcnc9Rr1dwGx0lQbhCBs2pXp eJLPd3wKNcjAUFgdFKD+x4GQR9zVPaI0Eo/Jd5WY/hx71vo99u6WJrC37tJQog== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 21/54] samba: Export all printers from CUPS Date: Tue, 13 Oct 2020 16:07:39 +0000 Message-Id: <20201013160812.27754-21-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/packages/aarch64/samba | 1 + config/rootfiles/packages/armv5tel/samba | 1 + config/rootfiles/packages/i586/samba | 1 + config/rootfiles/packages/x86_64/samba | 1 + html/cgi-bin/samba.cgi | 6 ++++++ lfs/samba | 4 ++++ 6 files changed, 14 insertions(+) diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index ad5ffb204..4ee93218e 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -807,6 +807,7 @@ var/lib/samba/bind-dns var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd +var/spool/samba srv/web/ipfire/cgi-bin/samba.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba index 9d445db8f..471d81982 100644 --- a/config/rootfiles/packages/armv5tel/samba +++ b/config/rootfiles/packages/armv5tel/samba @@ -807,6 +807,7 @@ var/lib/samba/bind-dns var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd +var/spool/samba srv/web/ipfire/cgi-bin/samba.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba index 0888fc6ed..73057db97 100644 --- a/config/rootfiles/packages/i586/samba +++ b/config/rootfiles/packages/i586/samba @@ -807,6 +807,7 @@ var/lib/samba/bind-dns var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd +var/spool/samba srv/web/ipfire/cgi-bin/samba.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index 54afad4d2..1940211d6 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -807,6 +807,7 @@ var/lib/samba/bind-dns var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd +var/spool/samba srv/web/ipfire/cgi-bin/samba.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index a9478a139..c0485b48d 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -198,6 +198,12 @@ logging = syslog preferred master = $sambasettings{'PREFERREDMASTER'} domain master = $sambasettings{'DOMAINMASTER'} local master = $sambasettings{'LOCALMASTER'} + +# Export all printers +[printers] +path = /var/spool/samba/ +printable = yes + END ; close FILE; diff --git a/lfs/samba b/lfs/samba index 5c527b257..38957cec9 100644 --- a/lfs/samba +++ b/lfs/samba @@ -110,6 +110,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod 750 /var/lib/samba/winbindd_privileged chgrp wbpriv /var/lib/samba/winbindd_privileged + # Create spool directory for print jobs + mkdir -p /var/spool/samba + chmod -v 1777 /var/spool/samba/ + #install initscripts $(call INSTALL_INITSCRIPT,samba) From patchwork Tue Oct 13 16:07:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3550 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTX27TTz3x1S for ; Tue, 13 Oct 2020 16:09:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSs2xLkz1KP; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSp1Y3Kz301n; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSl69kLz304k for ; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSk2Gf3z1Gj; Tue, 13 Oct 2020 16:08:22 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NQ1ma/XN69nWnuK1MNTt78wclwap25lzWdfgmqku/5E=; b=zOoSM2BlLpiOlRr4qpbDu31FEx/igSfQW8X+hC8Mpxcu/+U9Kih+HR60I4FpKkyfBHMKam ObDbTp2Op01pVJAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NQ1ma/XN69nWnuK1MNTt78wclwap25lzWdfgmqku/5E=; b=mOgKZAkQ3ztmhufNkl3BaeK05kv/O3mwNyFRdWu38+OqZYZAW5dkLFf6v4dlWoT7DmQPhf sJTUwx4dY4SONAsH1SzlE4kPIj4hLW4U7LMUh3dUr8ZBYjoqnltX/9VlKuRTxlb//uqen/ huXEgQ5JC9MtYRYBMtznAGtDfTnu7G0y6yVMOo5hIS+Bp/XriPlcnUgFY7/bWLdk5BCEPu +NvWkpnOXZRdU/b6Nxd+69aeGbB57CFoSLXKrx5znHH1Bvw9Wco1DHzfGlwjneKmUadWbT LZCeWvfgH7bZpSd2fOh0UGnhjxeXR0685TYAIA44aRDjeoBllWNJ4weKVJ09Xw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 22/54] samba: Add option to require clients to encrypt the connection Date: Tue, 13 Oct 2020 16:07:40 +0000 Message-Id: <20201013160812.27754-22-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- doc/language_issues.de | 44 ++++++++++++++++++++++++++++++++++++++++++ doc/language_issues.en | 44 +++--------------------------------------- doc/language_issues.es | 44 ++++++++++++++++++++++++++++++++++++++++++ doc/language_issues.fr | 44 ++++++++++++++++++++++++++++++++++++++++++ doc/language_issues.it | 44 ++++++++++++++++++++++++++++++++++++++++++ doc/language_issues.nl | 44 ++++++++++++++++++++++++++++++++++++++++++ doc/language_issues.pl | 44 ++++++++++++++++++++++++++++++++++++++++++ doc/language_issues.ru | 44 ++++++++++++++++++++++++++++++++++++++++++ doc/language_issues.tr | 44 ++++++++++++++++++++++++++++++++++++++++++ doc/language_missings | 24 +++++++++++++++++++++++ html/cgi-bin/samba.cgi | 18 ++++++++++++++++- langs/en/cgi-bin/en.pl | 3 +++ 12 files changed, 399 insertions(+), 42 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index f2a7ba8ae..e21a5fd31 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -39,12 +39,14 @@ WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network WARNING: translation string unused: add new ovpn +WARNING: translation string unused: add printer WARNING: translation string unused: add service WARNING: translation string unused: add subclass WARNING: translation string unused: add xtaccess WARNING: translation string unused: add-route WARNING: translation string unused: addon WARNING: translation string unused: admin user password has been changed +WARNING: translation string unused: admin users WARNING: translation string unused: administrator user password WARNING: translation string unused: adsl settings WARNING: translation string unused: advproxy AUTH method ntlm @@ -142,6 +144,7 @@ WARNING: translation string unused: check for net traffic update WARNING: translation string unused: choose config WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem @@ -157,6 +160,7 @@ WARNING: translation string unused: could not open available updates file WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file WARNING: translation string unused: create +WARNING: translation string unused: create mask WARNING: translation string unused: create new backup WARNING: translation string unused: current dynamic leases WARNING: translation string unused: current media @@ -194,8 +198,11 @@ WARNING: translation string unused: dhcp mode WARNING: translation string unused: dial user password WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings +WARNING: translation string unused: directory mask +WARNING: translation string unused: directory writeable WARNING: translation string unused: disconnect WARNING: translation string unused: disconnects +WARNING: translation string unused: display charset WARNING: translation string unused: display traffic at home WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration @@ -223,6 +230,7 @@ WARNING: translation string unused: dnssec information WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link +WARNING: translation string unused: dos charset WARNING: translation string unused: download dh parameter WARNING: translation string unused: download new ruleset WARNING: translation string unused: driver @@ -233,6 +241,7 @@ WARNING: translation string unused: eciadsl help WARNING: translation string unused: eciadsl upload WARNING: translation string unused: edit a rule WARNING: translation string unused: edit network +WARNING: translation string unused: edit printer WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg @@ -262,6 +271,7 @@ WARNING: translation string unused: esp encryption WARNING: translation string unused: esp grouptype WARNING: translation string unused: esp integrity WARNING: translation string unused: esp keylife +WARNING: translation string unused: exampel WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -277,6 +287,7 @@ WARNING: translation string unused: filename WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update +WARNING: translation string unused: force user WARNING: translation string unused: forward firewall WARNING: translation string unused: forwarding rule added WARNING: translation string unused: forwarding rule removed @@ -340,11 +351,14 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface +WARNING: translation string unused: guest ok WARNING: translation string unused: gz with key WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host +WARNING: translation string unused: host allow WARNING: translation string unused: host configuration +WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 @@ -377,6 +391,7 @@ WARNING: translation string unused: invalid port list WARNING: translation string unused: invalid time entered WARNING: translation string unused: invalid uplink speed WARNING: translation string unused: invalid upstream proxy username or password setting +WARNING: translation string unused: invalid users WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side @@ -396,6 +411,7 @@ WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line +WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk WARNING: translation string unused: localkey @@ -404,7 +420,9 @@ WARNING: translation string unused: locationblock country code WARNING: translation string unused: locationblock country name WARNING: translation string unused: locationblock flag WARNING: translation string unused: log enabled +WARNING: translation string unused: log level WARNING: translation string unused: log var messages +WARNING: translation string unused: log view WARNING: translation string unused: log viewer WARNING: translation string unused: logging WARNING: translation string unused: loosedirectorychecking @@ -422,6 +440,7 @@ WARNING: translation string unused: mac address error not 00 WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn +WARNING: translation string unused: manage printers WARNING: translation string unused: manual WARNING: translation string unused: manual control and status WARNING: translation string unused: marked @@ -432,6 +451,7 @@ WARNING: translation string unused: mbmon fan in WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value +WARNING: translation string unused: meaning WARNING: translation string unused: messages logging WARNING: translation string unused: min size WARNING: translation string unused: missing dat @@ -451,6 +471,7 @@ WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS +WARNING: translation string unused: my new share WARNING: translation string unused: nat-traversal WARNING: translation string unused: net WARNING: translation string unused: net address @@ -458,6 +479,7 @@ WARNING: translation string unused: net config type WARNING: translation string unused: net config type help WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration +WARNING: translation string unused: netbios name WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed @@ -474,6 +496,7 @@ WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver WARNING: translation string unused: no hardware random number generator WARNING: translation string unused: no information available +WARNING: translation string unused: no log selected WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname @@ -551,6 +574,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: path to directory WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -560,6 +584,11 @@ WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe WARNING: translation string unused: present +WARNING: translation string unused: printcap name +WARNING: translation string unused: printer +WARNING: translation string unused: printername +WARNING: translation string unused: printing +WARNING: translation string unused: printing options WARNING: translation string unused: profiles WARNING: translation string unused: proxy WARNING: translation string unused: proxy access graphs @@ -568,6 +597,7 @@ WARNING: translation string unused: proxy no proxy local WARNING: translation string unused: proxy port WARNING: translation string unused: psk WARNING: translation string unused: qos add subclass +WARNING: translation string unused: read list WARNING: translation string unused: reboot ask WARNING: translation string unused: reboot question WARNING: translation string unused: reboot schedule @@ -580,7 +610,10 @@ WARNING: translation string unused: reportlevel WARNING: translation string unused: requested data WARNING: translation string unused: reserved dst port WARNING: translation string unused: reserved src port +WARNING: translation string unused: reset shares +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: root WARNING: translation string unused: root path @@ -600,12 +633,15 @@ WARNING: translation string unused: selecttraffic WARNING: translation string unused: send email notification WARNING: translation string unused: send test mail WARNING: translation string unused: server reserved +WARNING: translation string unused: server string WARNING: translation string unused: service added WARNING: translation string unused: service removed WARNING: translation string unused: service updated WARNING: translation string unused: servicename WARNING: translation string unused: services settings WARNING: translation string unused: shaping list options +WARNING: translation string unused: show last x lines +WARNING: translation string unused: show share options WARNING: translation string unused: shutdown ask WARNING: translation string unused: shutdown sure WARNING: translation string unused: shutdown2 @@ -614,6 +650,7 @@ WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport +WARNING: translation string unused: socket options WARNING: translation string unused: source ip bad WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net @@ -699,6 +736,7 @@ WARNING: translation string unused: tripwirewarningpolicy WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted +WARNING: translation string unused: unix charset WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -735,6 +773,7 @@ WARNING: translation string unused: use WARNING: translation string unused: use dov WARNING: translation string unused: use ibod WARNING: translation string unused: view log +WARNING: translation string unused: visible in browselist WARNING: translation string unused: vpn aggrmode WARNING: translation string unused: vpn delayed start WARNING: translation string unused: vpn delayed start help @@ -750,6 +789,8 @@ WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards +WARNING: translation string unused: wins server +WARNING: translation string unused: wins support WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert @@ -767,6 +808,7 @@ WARNING: translation string unused: zoneconf val ppp assignment error WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val zoneslave amount error +WARNING: untranslated string: desired = Desired WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string @@ -800,7 +842,9 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: no entries = No entries at the moment. +WARNING: untranslated string: optional = Optional WARNING: untranslated string: pakfire invalid tree = Invalid repository selected +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 diff --git a/doc/language_issues.en b/doc/language_issues.en index 5b2e23def..07e6b2873 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -105,12 +105,10 @@ WARNING: untranslated string: add a host = Add a host WARNING: untranslated string: add device = Add device WARNING: untranslated string: add new alias = Add a new alias WARNING: untranslated string: add new lease = Add a new fixed lease -WARNING: untranslated string: add printer = Add printer WARNING: untranslated string: add share = Add share WARNING: untranslated string: add user = Add user WARNING: untranslated string: added from dhcp lease list = Added from DHCP lease list WARNING: untranslated string: addons = Addons -WARNING: untranslated string: admin users = User with superuser rights WARNING: untranslated string: administrator password = Administrator password WARNING: untranslated string: administrator username = Administrator username WARNING: untranslated string: advanced = Advanced @@ -474,7 +472,6 @@ WARNING: untranslated string: click to enable = Disabled (click to enable) WARNING: untranslated string: client = Workstation Name WARNING: untranslated string: clock has not been synchronized = Clock has not been synchronized WARNING: untranslated string: clock last synchronized at = Clock was last synchronized at -WARNING: untranslated string: comment = Description: WARNING: untranslated string: common name = Common name WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules WARNING: untranslated string: comp-lzo = LZO-Compression: @@ -513,7 +510,6 @@ WARNING: untranslated string: cpu steal usage = Steal CPU Usage WARNING: untranslated string: cpu system usage = System CPU Usage WARNING: untranslated string: cpu usage per = CPU Usage per WARNING: untranslated string: cpu user usage = User CPU Usage -WARNING: untranslated string: create mask = UNIX rights for new created files WARNING: untranslated string: credits = Credits WARNING: untranslated string: crl = Certificate Revocation List WARNING: untranslated string: cron server = CRON Server @@ -552,6 +548,7 @@ 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 WARNING: untranslated string: destination = Destination WARNING: untranslated string: destination ip = Destination IP @@ -599,14 +596,11 @@ WARNING: untranslated string: dial = Connect WARNING: untranslated string: dial profile = Connect with profile WARNING: untranslated string: dialing mode = Dialing mode: WARNING: untranslated string: dialup red not ppp = Dialup profiles can only used if RED is set to PPP Dialup
Check the networking setup. -WARNING: untranslated string: directory mask = UNIX directory rights -WARNING: untranslated string: directory writeable = directory writeable WARNING: untranslated string: disabled = disabled WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: disk access = Disk Access WARNING: untranslated string: disk usage = Disk usage WARNING: untranslated string: display = Display -WARNING: untranslated string: display charset = Display Charset WARNING: untranslated string: display hostname in window title = Display hostname in window title WARNING: untranslated string: dl client arch = Download Client Package (zip) WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) @@ -652,7 +646,6 @@ WARNING: untranslated string: domain name = Domain name WARNING: untranslated string: domain name suffix = Domain name suffix: WARNING: untranslated string: donation = Donation WARNING: untranslated string: donation-text = IPFire is driven and maintained by volunteers in their free time. To keep this project running costs incurred, if you like to support us we would be pleased by a small donation. -WARNING: untranslated string: dos charset = DOS Charset WARNING: untranslated string: down and up speed = Enter your Down- and Uplink-Speed
and then press Save. WARNING: untranslated string: downlink = Downlink WARNING: untranslated string: downlink speed = Downlink speed (kbit/sec) @@ -695,7 +688,6 @@ WARNING: untranslated string: edit an existing host = Edit an existing host WARNING: untranslated string: edit an existing lease = Edit an existing lease WARNING: untranslated string: edit device = Edit device WARNING: untranslated string: edit hosts = Edit Hosts -WARNING: untranslated string: edit printer = edit printer WARNING: untranslated string: edit share = Edit share WARNING: untranslated string: eight hours = 8 Hours WARNING: untranslated string: email config = Configuration @@ -736,7 +728,6 @@ WARNING: untranslated string: error messages = Error messages WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: esp keylife should be between 1 and 24 hours = ESP keylife should be between 1 and 24 hours. WARNING: untranslated string: every = Every -WARNING: untranslated string: exampel = example WARNING: untranslated string: exclude logfiles = Exclude logfiles WARNING: untranslated string: excluding buffers and cache = -/+ buffers/cache WARNING: untranslated string: expires = Expires @@ -798,7 +789,6 @@ WARNING: untranslated string: fixed ip lease modified = Fixed IP lease modified WARNING: untranslated string: fixed ip lease removed = Fixed IP lease removed WARNING: untranslated string: flag = Flag WARNING: untranslated string: force enable = Forced -WARNING: untranslated string: force user = force all new file to user WARNING: untranslated string: foreshadow = Foreshadow WARNING: untranslated string: four hours = 4 Hours WARNING: untranslated string: free = Free @@ -1012,7 +1002,6 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string -WARNING: untranslated string: guest ok = allow guests to access WARNING: untranslated string: gui settings = GUI Settings WARNING: untranslated string: hangup = Disconnect WARNING: untranslated string: hangup string = Hangup: @@ -1025,9 +1014,7 @@ WARNING: untranslated string: help = Help WARNING: untranslated string: high = High WARNING: untranslated string: high memory usage = High memory usage WARNING: untranslated string: holdoff = Holdoff time (in seconds) -WARNING: untranslated string: host allow = list with allowed hosts WARNING: untranslated string: host certificate = Host Certificate -WARNING: untranslated string: host deny = list with denied hosts WARNING: untranslated string: host ip = Host IP address WARNING: untranslated string: host to net vpn = Host-to-Net Virtual Private Network (RoadWarrior) WARNING: untranslated string: hostname = Hostname @@ -1144,7 +1131,6 @@ WARNING: untranslated string: invalid secondary dns = Invalid secondary DNS. WARNING: untranslated string: invalid secondary ntp = Invalid Secondary NTP server address WARNING: untranslated string: invalid start address = Invalid start address. WARNING: untranslated string: invalid time period = Invalid time period -WARNING: untranslated string: invalid users = list with users denied to access WARNING: untranslated string: invalid vpi vpci = Invalid VPI/VPCI settings WARNING: untranslated string: invalid wins address = Invalid WINS server address. WARNING: untranslated string: ip address = IP address @@ -1187,7 +1173,6 @@ WARNING: untranslated string: legacy architecture warning = You are running IPFi WARNING: untranslated string: legend = Legend WARNING: untranslated string: lifetime = Lifetime: WARNING: untranslated string: linkq = Link Quality -WARNING: untranslated string: load printer = Load Printer WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: local master = Local Master WARNING: untranslated string: local ntp server specified but not enabled = Local NTP server specified but not enabled @@ -1202,14 +1187,12 @@ WARNING: untranslated string: locationblock country is allowed = Incoming traffi WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked WARNING: untranslated string: locationblock enable feature = Enable Location based blocking: WARNING: untranslated string: log = Log -WARNING: untranslated string: log level = Log Level WARNING: untranslated string: log lines per page = Lines per page WARNING: untranslated string: log server address = Syslog server: WARNING: untranslated string: log server protocol = protocol: WARNING: untranslated string: log settings = Log Settings WARNING: untranslated string: log summaries = Log summaries WARNING: untranslated string: log summary = Log Summary -WARNING: untranslated string: log view = Log View WARNING: untranslated string: log viewing options = Log viewing options WARNING: untranslated string: log-options = Logfile options WARNING: untranslated string: loged in at = Logged in at @@ -1237,7 +1220,6 @@ WARNING: untranslated string: mac1 new = new MAC address 1 (vdsl-inet): WARNING: untranslated string: mac2 new = new MAC address 2 (vdsl-iptv): WARNING: untranslated string: magic packet send to: = Magic packet send to: WARNING: untranslated string: main page = Main page -WARNING: untranslated string: manage printers = manage printers WARNING: untranslated string: manage shares = Manage Shares WARNING: untranslated string: manually = Manually WARNING: untranslated string: map to guest = Map to Guest @@ -1264,7 +1246,6 @@ WARNING: untranslated string: mbmon label = Label WARNING: untranslated string: mbmon settings = mbmongraph settings WARNING: untranslated string: mbmon temp = Temperature WARNING: untranslated string: mbmon volt = Voltage -WARNING: untranslated string: meaning = meaning WARNING: untranslated string: media = Media WARNING: untranslated string: media information = Media information WARNING: untranslated string: medium = Medium @@ -1316,7 +1297,6 @@ WARNING: untranslated string: mpfire search = MPFire Search WARNING: untranslated string: mpfire songs = MPFire songlist WARNING: untranslated string: mpfire webradio = MPFire Webradio WARNING: untranslated string: mtu = MTU -WARNING: untranslated string: my new share = My new share WARNING: untranslated string: name = Name WARNING: untranslated string: name is invalid = Name is invalid WARNING: untranslated string: name must only contain characters = Name must only contain characters. @@ -1325,7 +1305,6 @@ WARNING: untranslated string: nameserver = Nameserver WARNING: untranslated string: needreboot = An update requires a restart WARNING: untranslated string: net config = Network configuration WARNING: untranslated string: net to net vpn = Net-to-Net Virtual Private Network -WARNING: untranslated string: netbios name = Netbios Name WARNING: untranslated string: netmask = Netmask WARNING: untranslated string: network = Network WARNING: untranslated string: network internal = Network (internal) @@ -1344,7 +1323,6 @@ WARNING: untranslated string: no data = unknown string WARNING: untranslated string: no dhcp lease = No DHCP lease has been acquired WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: no filter pass = Enter the standard class for non-filtered packets. -WARNING: untranslated string: no log selected = No log selected WARNING: untranslated string: no time limit = unlimited time WARNING: untranslated string: none = none WARNING: untranslated string: none found = none found @@ -1393,6 +1371,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix n WARNING: untranslated string: openvpn prefix remote subnet = Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0. WARNING: untranslated string: openvpn server = OpenVPN server WARNING: untranslated string: openvpn subnet is used = The given subnet is used by another OpenVPN server. +WARNING: untranslated string: optional = Optional WARNING: untranslated string: optional at cmd = optional AT command WARNING: untranslated string: options = Options WARNING: untranslated string: options fw = Firewall Options @@ -1475,7 +1454,6 @@ WARNING: untranslated string: password = Password: WARNING: untranslated string: password not set = Password not set. WARNING: untranslated string: password too short = Password is too short. WARNING: untranslated string: passwords do not match = Passwords do not match. -WARNING: untranslated string: path to directory = path to share WARNING: untranslated string: pc = Workstation WARNING: untranslated string: pc add = Add workstation WARNING: untranslated string: pdc options = PDC options @@ -1500,11 +1478,6 @@ WARNING: untranslated string: prev = previous WARNING: untranslated string: primary dns = Primary DNS: WARNING: untranslated string: primary ntp server = Primary NTP server WARNING: untranslated string: primary wins server address = Primary WINS server address -WARNING: untranslated string: printcap name = Printercap name -WARNING: untranslated string: printer = Printer -WARNING: untranslated string: printername = Printername -WARNING: untranslated string: printing = Printing -WARNING: untranslated string: printing options = printing options WARNING: untranslated string: priority = Priority WARNING: untranslated string: processes = Processes WARNING: untranslated string: processor vulnerability mitigations = Processor Vulnerability Mitigations @@ -1540,7 +1513,6 @@ WARNING: untranslated string: ram = RAM WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: read bytes = Bytes Read -WARNING: untranslated string: read list = list with readonly hosts WARNING: untranslated string: real address = Real Address WARNING: untranslated string: reboot = Reboot WARNING: untranslated string: rebooting = Rebooting @@ -1569,11 +1541,9 @@ WARNING: untranslated string: remove ca certificate = Remove CA certificate WARNING: untranslated string: remove x509 = Remove x509 WARNING: untranslated string: repeat = Repeat WARNING: untranslated string: request = Request +WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field WARNING: untranslated string: reset = Reset -WARNING: untranslated string: reset shares = Reset share -WARNING: untranslated string: resetglobals = Reset global settings -WARNING: untranslated string: resetshares = Reset shares? WARNING: untranslated string: resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections = Resetting the X509 remove the root CA, the host certificate and all certificate based connections. WARNING: untranslated string: restart = Restart WARNING: untranslated string: restart ovpn server = Restart OpenVPN server @@ -1613,7 +1583,6 @@ WARNING: untranslated string: sent = Sent WARNING: untranslated string: september = September WARNING: untranslated string: serial = Serial WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running. -WARNING: untranslated string: server string = Server String WARNING: untranslated string: service = Service WARNING: untranslated string: service name = Service name: WARNING: untranslated string: services = Services @@ -1630,9 +1599,7 @@ WARNING: untranslated string: show certificate = Show file WARNING: untranslated string: show crl = Show certificate revocation list WARNING: untranslated string: show dh = Show Diffie-Hellman parameters WARNING: untranslated string: show host certificate = Show host certificate -WARNING: untranslated string: show last x lines = Show last x lines WARNING: untranslated string: show root certificate = Show root certificate -WARNING: untranslated string: show share options = Show shares options WARNING: untranslated string: show tls-auth key = Show tls-auth key WARNING: untranslated string: shuffle = Shuffle WARNING: untranslated string: shutdown = Shutdown @@ -1651,7 +1618,6 @@ WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported WARNING: untranslated string: snat new source ip address = New source IP address -WARNING: untranslated string: socket options = Socket options WARNING: untranslated string: software version = Software Version WARNING: untranslated string: sort ascending = Sort ascending WARNING: untranslated string: sort descending = Sort descending @@ -1804,7 +1770,6 @@ WARNING: untranslated string: unblock = Unblock WARNING: untranslated string: unblock all = Unblock all WARNING: untranslated string: uncheck all = Uncheck all WARNING: untranslated string: uninstall = Uninstall -WARNING: untranslated string: unix charset = UNIX Charset WARNING: untranslated string: unix group = UNIX usergroup WARNING: untranslated string: unix password sync = Unix Password Sync WARNING: untranslated string: unix shell = UNIX Shell @@ -2101,7 +2066,6 @@ WARNING: untranslated string: vci number = VCI number: WARNING: untranslated string: vendor = Vendor WARNING: untranslated string: virtual address = Virtual Address WARNING: untranslated string: virtual private networking = Virtual Private Networking -WARNING: untranslated string: visible in browselist = visible in browselist WARNING: untranslated string: visit us at = Visit us at WARNING: untranslated string: voldown10 = Decrease volume by 10 WARNING: untranslated string: voldown5 = Decrease volume by 5 @@ -2146,8 +2110,6 @@ WARNING: untranslated string: website = Website WARNING: untranslated string: wednesday = Wednesday WARNING: untranslated string: week = Week WARNING: untranslated string: weeks = Weeks -WARNING: untranslated string: wins server = Wins Server -WARNING: untranslated string: wins support = Wins Support WARNING: untranslated string: wireless = Wireless WARNING: untranslated string: wireless config added = Wireless config added WARNING: untranslated string: wireless config changed = Wireless config changed diff --git a/doc/language_issues.es b/doc/language_issues.es index e8b39de69..69cfa239a 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -18,11 +18,13 @@ WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network WARNING: translation string unused: add new ovpn +WARNING: translation string unused: add printer WARNING: translation string unused: add service WARNING: translation string unused: add subclass WARNING: translation string unused: add xtaccess WARNING: translation string unused: add-route WARNING: translation string unused: admin user password has been changed +WARNING: translation string unused: admin users WARNING: translation string unused: administrator user password WARNING: translation string unused: advproxy LDAP auth WARNING: translation string unused: advproxy NTLM BDC hostname @@ -131,6 +133,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem @@ -147,6 +150,7 @@ WARNING: translation string unused: could not open available updates file WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file WARNING: translation string unused: create +WARNING: translation string unused: create mask WARNING: translation string unused: create new backup WARNING: translation string unused: current dynamic leases WARNING: translation string unused: current media @@ -184,8 +188,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface WARNING: translation string unused: dial user password WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings +WARNING: translation string unused: directory mask +WARNING: translation string unused: directory writeable WARNING: translation string unused: disconnect WARNING: translation string unused: disconnects +WARNING: translation string unused: display charset WARNING: translation string unused: display traffic at home WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration @@ -212,6 +219,7 @@ WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done +WARNING: translation string unused: dos charset WARNING: translation string unused: download new ruleset WARNING: translation string unused: driver WARNING: translation string unused: drop output @@ -222,6 +230,7 @@ WARNING: translation string unused: eciadsl help WARNING: translation string unused: eciadsl upload WARNING: translation string unused: edit a rule WARNING: translation string unused: edit network +WARNING: translation string unused: edit printer WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg @@ -247,6 +256,7 @@ WARNING: translation string unused: esp encryption WARNING: translation string unused: esp grouptype WARNING: translation string unused: esp integrity WARNING: translation string unused: esp keylife +WARNING: translation string unused: exampel WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -264,6 +274,7 @@ WARNING: translation string unused: firewall log viewer WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update +WARNING: translation string unused: force user WARNING: translation string unused: forwarding rule added WARNING: translation string unused: forwarding rule removed WARNING: translation string unused: forwarding rule updated @@ -285,11 +296,14 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface +WARNING: translation string unused: guest ok WARNING: translation string unused: gz with key WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host +WARNING: translation string unused: host allow WARNING: translation string unused: host configuration +WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 @@ -327,6 +341,7 @@ WARNING: translation string unused: invalid port list WARNING: translation string unused: invalid time entered WARNING: translation string unused: invalid uplink speed WARNING: translation string unused: invalid upstream proxy username or password setting +WARNING: translation string unused: invalid users WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side @@ -345,6 +360,7 @@ WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line +WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk WARNING: translation string unused: localkey @@ -353,7 +369,9 @@ WARNING: translation string unused: locationblock country code WARNING: translation string unused: locationblock country name WARNING: translation string unused: locationblock flag WARNING: translation string unused: log enabled +WARNING: translation string unused: log level WARNING: translation string unused: log var messages +WARNING: translation string unused: log view WARNING: translation string unused: log viewer WARNING: translation string unused: logging WARNING: translation string unused: loosedirectorychecking @@ -371,6 +389,7 @@ WARNING: translation string unused: mac address error not 00 WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn +WARNING: translation string unused: manage printers WARNING: translation string unused: manual WARNING: translation string unused: manual control and status WARNING: translation string unused: marked @@ -381,6 +400,7 @@ WARNING: translation string unused: mbmon fan in WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value +WARNING: translation string unused: meaning WARNING: translation string unused: messages logging WARNING: translation string unused: min size WARNING: translation string unused: missing dat @@ -400,6 +420,7 @@ WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS +WARNING: translation string unused: my new share WARNING: translation string unused: nat-traversal WARNING: translation string unused: net WARNING: translation string unused: net address @@ -407,6 +428,7 @@ WARNING: translation string unused: net config type WARNING: translation string unused: net config type help WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration +WARNING: translation string unused: netbios name WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed @@ -421,6 +443,7 @@ WARNING: translation string unused: no cfg upload WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver WARNING: translation string unused: no information available +WARNING: translation string unused: no log selected WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname @@ -475,6 +498,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: path to directory WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -484,6 +508,11 @@ WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe WARNING: translation string unused: present +WARNING: translation string unused: printcap name +WARNING: translation string unused: printer +WARNING: translation string unused: printername +WARNING: translation string unused: printing +WARNING: translation string unused: printing options WARNING: translation string unused: profiles WARNING: translation string unused: proxy WARNING: translation string unused: proxy access graphs @@ -493,6 +522,7 @@ WARNING: translation string unused: proxy port WARNING: translation string unused: psk WARNING: translation string unused: qos add subclass WARNING: translation string unused: quick control +WARNING: translation string unused: read list WARNING: translation string unused: reboot ask WARNING: translation string unused: reboot question WARNING: translation string unused: reboot schedule @@ -505,7 +535,10 @@ WARNING: translation string unused: reportlevel WARNING: translation string unused: requested data WARNING: translation string unused: reserved dst port WARNING: translation string unused: reserved src port +WARNING: translation string unused: reset shares +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: root WARNING: translation string unused: root path @@ -524,6 +557,7 @@ WARNING: translation string unused: selecttraffic WARNING: translation string unused: send email notification WARNING: translation string unused: send test mail WARNING: translation string unused: server reserved +WARNING: translation string unused: server string WARNING: translation string unused: service added WARNING: translation string unused: service removed WARNING: translation string unused: service updated @@ -532,7 +566,9 @@ WARNING: translation string unused: services settings WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas +WARNING: translation string unused: show last x lines WARNING: translation string unused: show lines +WARNING: translation string unused: show share options WARNING: translation string unused: shutdown ask WARNING: translation string unused: shutdown sure WARNING: translation string unused: shutdown2 @@ -543,6 +579,7 @@ WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits WARNING: translation string unused: snort working +WARNING: translation string unused: socket options WARNING: translation string unused: source ip bad WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net @@ -622,6 +659,7 @@ WARNING: translation string unused: tripwirewarningpolicy WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted +WARNING: translation string unused: unix charset WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -656,6 +694,7 @@ WARNING: translation string unused: use WARNING: translation string unused: use dov WARNING: translation string unused: use ibod WARNING: translation string unused: view log +WARNING: translation string unused: visible in browselist WARNING: translation string unused: vpn aggrmode WARNING: translation string unused: vpn configuration main WARNING: translation string unused: vpn delayed start @@ -672,6 +711,8 @@ WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards +WARNING: translation string unused: wins server +WARNING: translation string unused: wins support WARNING: translation string unused: wlanap access point WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error @@ -805,6 +846,7 @@ WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: dead peer detection = Dead Peer Detection WARNING: untranslated string: default = Default WARNING: untranslated string: default IP address = Default IP Address +WARNING: untranslated string: desired = Desired WARNING: untranslated string: details = Details WARNING: untranslated string: dh = Diffie-Hellman parameters WARNING: untranslated string: dh key move failed = Diffie-Hellman parameters move failed. @@ -1210,6 +1252,7 @@ WARNING: untranslated string: openvpn prefix local subnet = Using the prefix not WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0. WARNING: untranslated string: openvpn prefix remote subnet = Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0. WARNING: untranslated string: openvpn subnet is used = The given subnet is used by another OpenVPN server. +WARNING: untranslated string: optional = Optional WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Access WARNING: untranslated string: outgoing firewall p2p allow = Using the P2P protocol is allowed @@ -1260,6 +1303,7 @@ WARNING: untranslated string: random number generator daemon = Random Number Gen WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: received = Received WARNING: untranslated string: red1 = RED +WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 9c7456d71..4a90b851d 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -43,12 +43,14 @@ WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network WARNING: translation string unused: add new ovpn +WARNING: translation string unused: add printer WARNING: translation string unused: add service WARNING: translation string unused: add subclass WARNING: translation string unused: add xtaccess WARNING: translation string unused: add-route WARNING: translation string unused: addon WARNING: translation string unused: admin user password has been changed +WARNING: translation string unused: admin users WARNING: translation string unused: administrator user password WARNING: translation string unused: adsl settings WARNING: translation string unused: advproxy AUTH method ntlm @@ -163,6 +165,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem @@ -179,6 +182,7 @@ WARNING: translation string unused: could not open available updates file WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file WARNING: translation string unused: create +WARNING: translation string unused: create mask WARNING: translation string unused: create new backup WARNING: translation string unused: cryptographic settings WARNING: translation string unused: current dynamic leases @@ -220,8 +224,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface WARNING: translation string unused: dial user password WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings +WARNING: translation string unused: directory mask +WARNING: translation string unused: directory writeable WARNING: translation string unused: disconnect WARNING: translation string unused: disconnects +WARNING: translation string unused: display charset WARNING: translation string unused: display traffic at home WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration @@ -251,6 +258,7 @@ WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done +WARNING: translation string unused: dos charset WARNING: translation string unused: download dh parameter WARNING: translation string unused: download new ruleset WARNING: translation string unused: driver @@ -261,6 +269,7 @@ WARNING: translation string unused: eciadsl help WARNING: translation string unused: eciadsl upload WARNING: translation string unused: edit a rule WARNING: translation string unused: edit network +WARNING: translation string unused: edit printer WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg @@ -290,6 +299,7 @@ WARNING: translation string unused: esp encryption WARNING: translation string unused: esp grouptype WARNING: translation string unused: esp integrity WARNING: translation string unused: esp keylife +WARNING: translation string unused: exampel WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -305,6 +315,7 @@ WARNING: translation string unused: filename WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update +WARNING: translation string unused: force user WARNING: translation string unused: forward firewall WARNING: translation string unused: forwarding rule added WARNING: translation string unused: forwarding rule removed @@ -368,11 +379,14 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface +WARNING: translation string unused: guest ok WARNING: translation string unused: gz with key WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host +WARNING: translation string unused: host allow WARNING: translation string unused: host configuration +WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 @@ -406,6 +420,7 @@ WARNING: translation string unused: invalid port list WARNING: translation string unused: invalid time entered WARNING: translation string unused: invalid uplink speed WARNING: translation string unused: invalid upstream proxy username or password setting +WARNING: translation string unused: invalid users WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side @@ -425,6 +440,7 @@ WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line +WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk WARNING: translation string unused: localkey @@ -433,7 +449,9 @@ WARNING: translation string unused: locationblock country code WARNING: translation string unused: locationblock country name WARNING: translation string unused: locationblock flag WARNING: translation string unused: log enabled +WARNING: translation string unused: log level WARNING: translation string unused: log var messages +WARNING: translation string unused: log view WARNING: translation string unused: log viewer WARNING: translation string unused: logging WARNING: translation string unused: loosedirectorychecking @@ -451,6 +469,7 @@ WARNING: translation string unused: mac address error not 00 WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn +WARNING: translation string unused: manage printers WARNING: translation string unused: manual WARNING: translation string unused: manual control and status WARNING: translation string unused: marked @@ -461,6 +480,7 @@ WARNING: translation string unused: mbmon fan in WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value +WARNING: translation string unused: meaning WARNING: translation string unused: messages logging WARNING: translation string unused: min size WARNING: translation string unused: missing dat @@ -480,6 +500,7 @@ WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS +WARNING: translation string unused: my new share WARNING: translation string unused: nat-traversal WARNING: translation string unused: net WARNING: translation string unused: net address @@ -487,6 +508,7 @@ WARNING: translation string unused: net config type WARNING: translation string unused: net config type help WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration +WARNING: translation string unused: netbios name WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed @@ -503,6 +525,7 @@ WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver WARNING: translation string unused: no hardware random number generator WARNING: translation string unused: no information available +WARNING: translation string unused: no log selected WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname @@ -582,6 +605,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: path to directory WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -591,6 +615,11 @@ WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe WARNING: translation string unused: present +WARNING: translation string unused: printcap name +WARNING: translation string unused: printer +WARNING: translation string unused: printername +WARNING: translation string unused: printing +WARNING: translation string unused: printing options WARNING: translation string unused: profiles WARNING: translation string unused: proxy WARNING: translation string unused: proxy access graphs @@ -600,6 +629,7 @@ WARNING: translation string unused: proxy port WARNING: translation string unused: psk WARNING: translation string unused: qos add subclass WARNING: translation string unused: quick control +WARNING: translation string unused: read list WARNING: translation string unused: reboot ask WARNING: translation string unused: reboot question WARNING: translation string unused: reboot schedule @@ -612,7 +642,10 @@ WARNING: translation string unused: reportlevel WARNING: translation string unused: requested data WARNING: translation string unused: reserved dst port WARNING: translation string unused: reserved src port +WARNING: translation string unused: reset shares +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: root WARNING: translation string unused: root path @@ -632,6 +665,7 @@ WARNING: translation string unused: selecttraffic WARNING: translation string unused: send email notification WARNING: translation string unused: send test mail WARNING: translation string unused: server reserved +WARNING: translation string unused: server string WARNING: translation string unused: service added WARNING: translation string unused: service removed WARNING: translation string unused: service updated @@ -640,7 +674,9 @@ WARNING: translation string unused: services settings WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas +WARNING: translation string unused: show last x lines WARNING: translation string unused: show lines +WARNING: translation string unused: show share options WARNING: translation string unused: shutdown ask WARNING: translation string unused: shutdown sure WARNING: translation string unused: shutdown2 @@ -649,6 +685,7 @@ WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport +WARNING: translation string unused: socket options WARNING: translation string unused: source ip bad WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net @@ -737,6 +774,7 @@ WARNING: translation string unused: tripwirewarningpolicy WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted +WARNING: translation string unused: unix charset WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -774,6 +812,7 @@ WARNING: translation string unused: use WARNING: translation string unused: use dov WARNING: translation string unused: use ibod WARNING: translation string unused: view log +WARNING: translation string unused: visible in browselist WARNING: translation string unused: vpn aggrmode WARNING: translation string unused: vpn configuration main WARNING: translation string unused: vpn delayed start @@ -790,6 +829,8 @@ WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards +WARNING: translation string unused: wins server +WARNING: translation string unused: wins support WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert @@ -807,6 +848,7 @@ WARNING: translation string unused: zoneconf val ppp assignment error WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val zoneslave amount error +WARNING: untranslated string: desired = Desired WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: guardian block a host = unknown string @@ -838,7 +880,9 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string +WARNING: untranslated string: optional = Optional WARNING: untranslated string: pakfire ago = ago. +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 diff --git a/doc/language_issues.it b/doc/language_issues.it index d47aafa14..6a0fe8007 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -19,11 +19,13 @@ WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network WARNING: translation string unused: add new ovpn +WARNING: translation string unused: add printer WARNING: translation string unused: add service WARNING: translation string unused: add subclass WARNING: translation string unused: add xtaccess WARNING: translation string unused: add-route WARNING: translation string unused: admin user password has been changed +WARNING: translation string unused: admin users WARNING: translation string unused: administrator user password WARNING: translation string unused: advproxy AUTH method ntlm WARNING: translation string unused: advproxy LDAP auth @@ -139,6 +141,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem @@ -155,6 +158,7 @@ WARNING: translation string unused: could not open available updates file WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file WARNING: translation string unused: create +WARNING: translation string unused: create mask WARNING: translation string unused: create new backup WARNING: translation string unused: current dynamic leases WARNING: translation string unused: current media @@ -195,8 +199,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface WARNING: translation string unused: dial user password WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings +WARNING: translation string unused: directory mask +WARNING: translation string unused: directory writeable WARNING: translation string unused: disconnect WARNING: translation string unused: disconnects +WARNING: translation string unused: display charset WARNING: translation string unused: display traffic at home WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration @@ -226,6 +233,7 @@ WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done +WARNING: translation string unused: dos charset WARNING: translation string unused: download dh parameter WARNING: translation string unused: download new ruleset WARNING: translation string unused: driver @@ -236,6 +244,7 @@ WARNING: translation string unused: eciadsl help WARNING: translation string unused: eciadsl upload WARNING: translation string unused: edit a rule WARNING: translation string unused: edit network +WARNING: translation string unused: edit printer WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg @@ -261,6 +270,7 @@ WARNING: translation string unused: esp encryption WARNING: translation string unused: esp grouptype WARNING: translation string unused: esp integrity WARNING: translation string unused: esp keylife +WARNING: translation string unused: exampel WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -278,6 +288,7 @@ WARNING: translation string unused: firewall log viewer WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update +WARNING: translation string unused: force user WARNING: translation string unused: forward firewall WARNING: translation string unused: forwarding rule added WARNING: translation string unused: forwarding rule removed @@ -342,11 +353,14 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface +WARNING: translation string unused: guest ok WARNING: translation string unused: gz with key WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host +WARNING: translation string unused: host allow WARNING: translation string unused: host configuration +WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 @@ -384,6 +398,7 @@ WARNING: translation string unused: invalid port list WARNING: translation string unused: invalid time entered WARNING: translation string unused: invalid uplink speed WARNING: translation string unused: invalid upstream proxy username or password setting +WARNING: translation string unused: invalid users WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side @@ -403,12 +418,15 @@ WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line +WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk WARNING: translation string unused: localkey WARNING: translation string unused: localkeyfile WARNING: translation string unused: log enabled +WARNING: translation string unused: log level WARNING: translation string unused: log var messages +WARNING: translation string unused: log view WARNING: translation string unused: log viewer WARNING: translation string unused: logging WARNING: translation string unused: loosedirectorychecking @@ -426,6 +444,7 @@ WARNING: translation string unused: mac address error not 00 WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn +WARNING: translation string unused: manage printers WARNING: translation string unused: manual WARNING: translation string unused: manual control and status WARNING: translation string unused: marked @@ -436,6 +455,7 @@ WARNING: translation string unused: mbmon fan in WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value +WARNING: translation string unused: meaning WARNING: translation string unused: messages logging WARNING: translation string unused: min size WARNING: translation string unused: missing dat @@ -455,6 +475,7 @@ WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS +WARNING: translation string unused: my new share WARNING: translation string unused: nat-traversal WARNING: translation string unused: net WARNING: translation string unused: net address @@ -462,6 +483,7 @@ WARNING: translation string unused: net config type WARNING: translation string unused: net config type help WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration +WARNING: translation string unused: netbios name WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed @@ -478,6 +500,7 @@ WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver WARNING: translation string unused: no hardware random number generator WARNING: translation string unused: no information available +WARNING: translation string unused: no log selected WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname @@ -556,6 +579,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: path to directory WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -565,6 +589,11 @@ WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe WARNING: translation string unused: present +WARNING: translation string unused: printcap name +WARNING: translation string unused: printer +WARNING: translation string unused: printername +WARNING: translation string unused: printing +WARNING: translation string unused: printing options WARNING: translation string unused: profiles WARNING: translation string unused: proxy WARNING: translation string unused: proxy access graphs @@ -574,6 +603,7 @@ WARNING: translation string unused: proxy port WARNING: translation string unused: psk WARNING: translation string unused: qos add subclass WARNING: translation string unused: quick control +WARNING: translation string unused: read list WARNING: translation string unused: reboot ask WARNING: translation string unused: reboot question WARNING: translation string unused: reboot schedule @@ -586,7 +616,10 @@ WARNING: translation string unused: reportlevel WARNING: translation string unused: requested data WARNING: translation string unused: reserved dst port WARNING: translation string unused: reserved src port +WARNING: translation string unused: reset shares +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: root WARNING: translation string unused: root path @@ -605,6 +638,7 @@ WARNING: translation string unused: selecttraffic WARNING: translation string unused: send email notification WARNING: translation string unused: send test mail WARNING: translation string unused: server reserved +WARNING: translation string unused: server string WARNING: translation string unused: service added WARNING: translation string unused: service removed WARNING: translation string unused: service updated @@ -613,7 +647,9 @@ WARNING: translation string unused: services settings WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas +WARNING: translation string unused: show last x lines WARNING: translation string unused: show lines +WARNING: translation string unused: show share options WARNING: translation string unused: shutdown ask WARNING: translation string unused: shutdown sure WARNING: translation string unused: shutdown2 @@ -624,6 +660,7 @@ WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits WARNING: translation string unused: snort working +WARNING: translation string unused: socket options WARNING: translation string unused: source ip bad WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net @@ -712,6 +749,7 @@ WARNING: translation string unused: tripwirewarningpolicy WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted +WARNING: translation string unused: unix charset WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -750,6 +788,7 @@ WARNING: translation string unused: use WARNING: translation string unused: use dov WARNING: translation string unused: use ibod WARNING: translation string unused: view log +WARNING: translation string unused: visible in browselist WARNING: translation string unused: vpn aggrmode WARNING: translation string unused: vpn configuration main WARNING: translation string unused: vpn delayed start @@ -766,6 +805,8 @@ WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards +WARNING: translation string unused: wins server +WARNING: translation string unused: wins support WARNING: translation string unused: wlanap access point WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error @@ -838,6 +879,7 @@ WARNING: untranslated string: crypto error = Cryptographic error WARNING: untranslated string: crypto warning = Cryptographic warning WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: default IP address = Default IP Address +WARNING: untranslated string: desired = Desired WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136): WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update @@ -1014,6 +1056,7 @@ WARNING: untranslated string: one month = One Month WARNING: untranslated string: one week = One Week WARNING: untranslated string: one year = One Year WARNING: untranslated string: open connections = Open Connections +WARNING: untranslated string: optional = Optional WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead WARNING: untranslated string: ovpn add conf = Additional configuration @@ -1036,6 +1079,7 @@ WARNING: untranslated string: processor vulnerability mitigations = Processor Vu WARNING: untranslated string: ptr = PTR WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: received = Received +WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string diff --git a/doc/language_issues.nl b/doc/language_issues.nl index db78163c8..2193d875a 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -19,11 +19,13 @@ WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network WARNING: translation string unused: add new ovpn +WARNING: translation string unused: add printer WARNING: translation string unused: add service WARNING: translation string unused: add subclass WARNING: translation string unused: add xtaccess WARNING: translation string unused: add-route WARNING: translation string unused: admin user password has been changed +WARNING: translation string unused: admin users WARNING: translation string unused: administrator user password WARNING: translation string unused: advproxy LDAP auth WARNING: translation string unused: advproxy NTLM BDC hostname @@ -138,6 +140,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem @@ -154,6 +157,7 @@ WARNING: translation string unused: could not open available updates file WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file WARNING: translation string unused: create +WARNING: translation string unused: create mask WARNING: translation string unused: create new backup WARNING: translation string unused: current dynamic leases WARNING: translation string unused: current media @@ -193,8 +197,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface WARNING: translation string unused: dial user password WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings +WARNING: translation string unused: directory mask +WARNING: translation string unused: directory writeable WARNING: translation string unused: disconnect WARNING: translation string unused: disconnects +WARNING: translation string unused: display charset WARNING: translation string unused: display traffic at home WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration @@ -222,6 +229,7 @@ WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done +WARNING: translation string unused: dos charset WARNING: translation string unused: download new ruleset WARNING: translation string unused: driver WARNING: translation string unused: drop output @@ -232,6 +240,7 @@ WARNING: translation string unused: eciadsl help WARNING: translation string unused: eciadsl upload WARNING: translation string unused: edit a rule WARNING: translation string unused: edit network +WARNING: translation string unused: edit printer WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg @@ -257,6 +266,7 @@ WARNING: translation string unused: esp encryption WARNING: translation string unused: esp grouptype WARNING: translation string unused: esp integrity WARNING: translation string unused: esp keylife +WARNING: translation string unused: exampel WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -274,6 +284,7 @@ WARNING: translation string unused: firewall log viewer WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update +WARNING: translation string unused: force user WARNING: translation string unused: forward firewall WARNING: translation string unused: forwarding rule added WARNING: translation string unused: forwarding rule removed @@ -338,11 +349,14 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface +WARNING: translation string unused: guest ok WARNING: translation string unused: gz with key WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host +WARNING: translation string unused: host allow WARNING: translation string unused: host configuration +WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 @@ -380,6 +394,7 @@ WARNING: translation string unused: invalid port list WARNING: translation string unused: invalid time entered WARNING: translation string unused: invalid uplink speed WARNING: translation string unused: invalid upstream proxy username or password setting +WARNING: translation string unused: invalid users WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side @@ -399,12 +414,15 @@ WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line +WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk WARNING: translation string unused: localkey WARNING: translation string unused: localkeyfile WARNING: translation string unused: log enabled +WARNING: translation string unused: log level WARNING: translation string unused: log var messages +WARNING: translation string unused: log view WARNING: translation string unused: log viewer WARNING: translation string unused: logging WARNING: translation string unused: loosedirectorychecking @@ -422,6 +440,7 @@ WARNING: translation string unused: mac address error not 00 WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn +WARNING: translation string unused: manage printers WARNING: translation string unused: manual WARNING: translation string unused: manual control and status WARNING: translation string unused: marked @@ -432,6 +451,7 @@ WARNING: translation string unused: mbmon fan in WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value +WARNING: translation string unused: meaning WARNING: translation string unused: messages logging WARNING: translation string unused: min size WARNING: translation string unused: missing dat @@ -451,6 +471,7 @@ WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS +WARNING: translation string unused: my new share WARNING: translation string unused: nat-traversal WARNING: translation string unused: net WARNING: translation string unused: net address @@ -458,6 +479,7 @@ WARNING: translation string unused: net config type WARNING: translation string unused: net config type help WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration +WARNING: translation string unused: netbios name WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed @@ -473,6 +495,7 @@ WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver WARNING: translation string unused: no hardware random number generator WARNING: translation string unused: no information available +WARNING: translation string unused: no log selected WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname @@ -549,6 +572,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: path to directory WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -558,6 +582,11 @@ WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe WARNING: translation string unused: present +WARNING: translation string unused: printcap name +WARNING: translation string unused: printer +WARNING: translation string unused: printername +WARNING: translation string unused: printing +WARNING: translation string unused: printing options WARNING: translation string unused: profiles WARNING: translation string unused: proxy WARNING: translation string unused: proxy access graphs @@ -567,6 +596,7 @@ WARNING: translation string unused: proxy port WARNING: translation string unused: psk WARNING: translation string unused: qos add subclass WARNING: translation string unused: quick control +WARNING: translation string unused: read list WARNING: translation string unused: reboot ask WARNING: translation string unused: reboot question WARNING: translation string unused: reboot schedule @@ -579,7 +609,10 @@ WARNING: translation string unused: reportlevel WARNING: translation string unused: requested data WARNING: translation string unused: reserved dst port WARNING: translation string unused: reserved src port +WARNING: translation string unused: reset shares +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: root WARNING: translation string unused: root path @@ -598,6 +631,7 @@ WARNING: translation string unused: selecttraffic WARNING: translation string unused: send email notification WARNING: translation string unused: send test mail WARNING: translation string unused: server reserved +WARNING: translation string unused: server string WARNING: translation string unused: service added WARNING: translation string unused: service removed WARNING: translation string unused: service updated @@ -606,7 +640,9 @@ WARNING: translation string unused: services settings WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas +WARNING: translation string unused: show last x lines WARNING: translation string unused: show lines +WARNING: translation string unused: show share options WARNING: translation string unused: shutdown ask WARNING: translation string unused: shutdown sure WARNING: translation string unused: shutdown2 @@ -617,6 +653,7 @@ WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits WARNING: translation string unused: snort working +WARNING: translation string unused: socket options WARNING: translation string unused: source ip bad WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net @@ -704,6 +741,7 @@ WARNING: translation string unused: tripwirewarningpolicy WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted +WARNING: translation string unused: unix charset WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -742,6 +780,7 @@ WARNING: translation string unused: use WARNING: translation string unused: use dov WARNING: translation string unused: use ibod WARNING: translation string unused: view log +WARNING: translation string unused: visible in browselist WARNING: translation string unused: vpn aggrmode WARNING: translation string unused: vpn configuration main WARNING: translation string unused: vpn delayed start @@ -758,6 +797,8 @@ WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards +WARNING: translation string unused: wins server +WARNING: translation string unused: wins support WARNING: translation string unused: wlanap access point WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error @@ -833,6 +874,7 @@ WARNING: untranslated string: crypto warning = Cryptographic warning WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: default = Default WARNING: untranslated string: default IP address = Default IP Address +WARNING: untranslated string: desired = Desired WARNING: untranslated string: dh = Diffie-Hellman parameters WARNING: untranslated string: dh key move failed = Diffie-Hellman parameters move failed. WARNING: untranslated string: dh key warn = Creating DH-parameters with a length of 2048 bits takes up to several minutes. Lengths of 3072 or 4096 bits might needs several hours. Please be patient. @@ -1039,6 +1081,7 @@ WARNING: untranslated string: one month = One Month WARNING: untranslated string: one week = One Week WARNING: untranslated string: one year = One Year WARNING: untranslated string: open connections = Open Connections +WARNING: untranslated string: optional = Optional WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead WARNING: untranslated string: ovpn add conf = Additional configuration @@ -1069,6 +1112,7 @@ WARNING: untranslated string: ptr = PTR WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: received = Received +WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string diff --git a/doc/language_issues.pl b/doc/language_issues.pl index e8b39de69..69cfa239a 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -18,11 +18,13 @@ WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network WARNING: translation string unused: add new ovpn +WARNING: translation string unused: add printer WARNING: translation string unused: add service WARNING: translation string unused: add subclass WARNING: translation string unused: add xtaccess WARNING: translation string unused: add-route WARNING: translation string unused: admin user password has been changed +WARNING: translation string unused: admin users WARNING: translation string unused: administrator user password WARNING: translation string unused: advproxy LDAP auth WARNING: translation string unused: advproxy NTLM BDC hostname @@ -131,6 +133,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem @@ -147,6 +150,7 @@ WARNING: translation string unused: could not open available updates file WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file WARNING: translation string unused: create +WARNING: translation string unused: create mask WARNING: translation string unused: create new backup WARNING: translation string unused: current dynamic leases WARNING: translation string unused: current media @@ -184,8 +188,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface WARNING: translation string unused: dial user password WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings +WARNING: translation string unused: directory mask +WARNING: translation string unused: directory writeable WARNING: translation string unused: disconnect WARNING: translation string unused: disconnects +WARNING: translation string unused: display charset WARNING: translation string unused: display traffic at home WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration @@ -212,6 +219,7 @@ WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done +WARNING: translation string unused: dos charset WARNING: translation string unused: download new ruleset WARNING: translation string unused: driver WARNING: translation string unused: drop output @@ -222,6 +230,7 @@ WARNING: translation string unused: eciadsl help WARNING: translation string unused: eciadsl upload WARNING: translation string unused: edit a rule WARNING: translation string unused: edit network +WARNING: translation string unused: edit printer WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg @@ -247,6 +256,7 @@ WARNING: translation string unused: esp encryption WARNING: translation string unused: esp grouptype WARNING: translation string unused: esp integrity WARNING: translation string unused: esp keylife +WARNING: translation string unused: exampel WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -264,6 +274,7 @@ WARNING: translation string unused: firewall log viewer WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update +WARNING: translation string unused: force user WARNING: translation string unused: forwarding rule added WARNING: translation string unused: forwarding rule removed WARNING: translation string unused: forwarding rule updated @@ -285,11 +296,14 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface +WARNING: translation string unused: guest ok WARNING: translation string unused: gz with key WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host +WARNING: translation string unused: host allow WARNING: translation string unused: host configuration +WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 @@ -327,6 +341,7 @@ WARNING: translation string unused: invalid port list WARNING: translation string unused: invalid time entered WARNING: translation string unused: invalid uplink speed WARNING: translation string unused: invalid upstream proxy username or password setting +WARNING: translation string unused: invalid users WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side @@ -345,6 +360,7 @@ WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line +WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk WARNING: translation string unused: localkey @@ -353,7 +369,9 @@ WARNING: translation string unused: locationblock country code WARNING: translation string unused: locationblock country name WARNING: translation string unused: locationblock flag WARNING: translation string unused: log enabled +WARNING: translation string unused: log level WARNING: translation string unused: log var messages +WARNING: translation string unused: log view WARNING: translation string unused: log viewer WARNING: translation string unused: logging WARNING: translation string unused: loosedirectorychecking @@ -371,6 +389,7 @@ WARNING: translation string unused: mac address error not 00 WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn +WARNING: translation string unused: manage printers WARNING: translation string unused: manual WARNING: translation string unused: manual control and status WARNING: translation string unused: marked @@ -381,6 +400,7 @@ WARNING: translation string unused: mbmon fan in WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value +WARNING: translation string unused: meaning WARNING: translation string unused: messages logging WARNING: translation string unused: min size WARNING: translation string unused: missing dat @@ -400,6 +420,7 @@ WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS +WARNING: translation string unused: my new share WARNING: translation string unused: nat-traversal WARNING: translation string unused: net WARNING: translation string unused: net address @@ -407,6 +428,7 @@ WARNING: translation string unused: net config type WARNING: translation string unused: net config type help WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration +WARNING: translation string unused: netbios name WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed @@ -421,6 +443,7 @@ WARNING: translation string unused: no cfg upload WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver WARNING: translation string unused: no information available +WARNING: translation string unused: no log selected WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname @@ -475,6 +498,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: path to directory WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -484,6 +508,11 @@ WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe WARNING: translation string unused: present +WARNING: translation string unused: printcap name +WARNING: translation string unused: printer +WARNING: translation string unused: printername +WARNING: translation string unused: printing +WARNING: translation string unused: printing options WARNING: translation string unused: profiles WARNING: translation string unused: proxy WARNING: translation string unused: proxy access graphs @@ -493,6 +522,7 @@ WARNING: translation string unused: proxy port WARNING: translation string unused: psk WARNING: translation string unused: qos add subclass WARNING: translation string unused: quick control +WARNING: translation string unused: read list WARNING: translation string unused: reboot ask WARNING: translation string unused: reboot question WARNING: translation string unused: reboot schedule @@ -505,7 +535,10 @@ WARNING: translation string unused: reportlevel WARNING: translation string unused: requested data WARNING: translation string unused: reserved dst port WARNING: translation string unused: reserved src port +WARNING: translation string unused: reset shares +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: root WARNING: translation string unused: root path @@ -524,6 +557,7 @@ WARNING: translation string unused: selecttraffic WARNING: translation string unused: send email notification WARNING: translation string unused: send test mail WARNING: translation string unused: server reserved +WARNING: translation string unused: server string WARNING: translation string unused: service added WARNING: translation string unused: service removed WARNING: translation string unused: service updated @@ -532,7 +566,9 @@ WARNING: translation string unused: services settings WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas +WARNING: translation string unused: show last x lines WARNING: translation string unused: show lines +WARNING: translation string unused: show share options WARNING: translation string unused: shutdown ask WARNING: translation string unused: shutdown sure WARNING: translation string unused: shutdown2 @@ -543,6 +579,7 @@ WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits WARNING: translation string unused: snort working +WARNING: translation string unused: socket options WARNING: translation string unused: source ip bad WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net @@ -622,6 +659,7 @@ WARNING: translation string unused: tripwirewarningpolicy WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted +WARNING: translation string unused: unix charset WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -656,6 +694,7 @@ WARNING: translation string unused: use WARNING: translation string unused: use dov WARNING: translation string unused: use ibod WARNING: translation string unused: view log +WARNING: translation string unused: visible in browselist WARNING: translation string unused: vpn aggrmode WARNING: translation string unused: vpn configuration main WARNING: translation string unused: vpn delayed start @@ -672,6 +711,8 @@ WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards +WARNING: translation string unused: wins server +WARNING: translation string unused: wins support WARNING: translation string unused: wlanap access point WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error @@ -805,6 +846,7 @@ WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: dead peer detection = Dead Peer Detection WARNING: untranslated string: default = Default WARNING: untranslated string: default IP address = Default IP Address +WARNING: untranslated string: desired = Desired WARNING: untranslated string: details = Details WARNING: untranslated string: dh = Diffie-Hellman parameters WARNING: untranslated string: dh key move failed = Diffie-Hellman parameters move failed. @@ -1210,6 +1252,7 @@ WARNING: untranslated string: openvpn prefix local subnet = Using the prefix not WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0. WARNING: untranslated string: openvpn prefix remote subnet = Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0. WARNING: untranslated string: openvpn subnet is used = The given subnet is used by another OpenVPN server. +WARNING: untranslated string: optional = Optional WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Access WARNING: untranslated string: outgoing firewall p2p allow = Using the P2P protocol is allowed @@ -1260,6 +1303,7 @@ WARNING: untranslated string: random number generator daemon = Random Number Gen WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: received = Received WARNING: untranslated string: red1 = RED +WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string diff --git a/doc/language_issues.ru b/doc/language_issues.ru index ef929331a..e9b6fd9b9 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -19,11 +19,13 @@ WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network WARNING: translation string unused: add new ovpn +WARNING: translation string unused: add printer WARNING: translation string unused: add service WARNING: translation string unused: add subclass WARNING: translation string unused: add xtaccess WARNING: translation string unused: add-route WARNING: translation string unused: admin user password has been changed +WARNING: translation string unused: admin users WARNING: translation string unused: administrator user password WARNING: translation string unused: advproxy LDAP auth WARNING: translation string unused: advproxy NTLM BDC hostname @@ -132,6 +134,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem @@ -148,6 +151,7 @@ WARNING: translation string unused: could not open available updates file WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file WARNING: translation string unused: create +WARNING: translation string unused: create mask WARNING: translation string unused: create new backup WARNING: translation string unused: current dynamic leases WARNING: translation string unused: current media @@ -184,8 +188,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface WARNING: translation string unused: dial user password WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings +WARNING: translation string unused: directory mask +WARNING: translation string unused: directory writeable WARNING: translation string unused: disconnect WARNING: translation string unused: disconnects +WARNING: translation string unused: display charset WARNING: translation string unused: display traffic at home WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration @@ -212,6 +219,7 @@ WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done +WARNING: translation string unused: dos charset WARNING: translation string unused: download new ruleset WARNING: translation string unused: driver WARNING: translation string unused: drop output @@ -222,6 +230,7 @@ WARNING: translation string unused: eciadsl help WARNING: translation string unused: eciadsl upload WARNING: translation string unused: edit a rule WARNING: translation string unused: edit network +WARNING: translation string unused: edit printer WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg @@ -247,6 +256,7 @@ WARNING: translation string unused: esp encryption WARNING: translation string unused: esp grouptype WARNING: translation string unused: esp integrity WARNING: translation string unused: esp keylife +WARNING: translation string unused: exampel WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -262,6 +272,7 @@ WARNING: translation string unused: firewall log viewer WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update +WARNING: translation string unused: force user WARNING: translation string unused: forwarding rule added WARNING: translation string unused: forwarding rule removed WARNING: translation string unused: forwarding rule updated @@ -282,11 +293,14 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface +WARNING: translation string unused: guest ok WARNING: translation string unused: gz with key WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host +WARNING: translation string unused: host allow WARNING: translation string unused: host configuration +WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only @@ -323,6 +337,7 @@ WARNING: translation string unused: invalid port list WARNING: translation string unused: invalid time entered WARNING: translation string unused: invalid uplink speed WARNING: translation string unused: invalid upstream proxy username or password setting +WARNING: translation string unused: invalid users WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side @@ -341,12 +356,15 @@ WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line +WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk WARNING: translation string unused: localkey WARNING: translation string unused: localkeyfile WARNING: translation string unused: log enabled +WARNING: translation string unused: log level WARNING: translation string unused: log var messages +WARNING: translation string unused: log view WARNING: translation string unused: log viewer WARNING: translation string unused: logging WARNING: translation string unused: loosedirectorychecking @@ -364,6 +382,7 @@ WARNING: translation string unused: mac address error not 00 WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn +WARNING: translation string unused: manage printers WARNING: translation string unused: manual WARNING: translation string unused: manual control and status WARNING: translation string unused: marked @@ -374,6 +393,7 @@ WARNING: translation string unused: mbmon fan in WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value +WARNING: translation string unused: meaning WARNING: translation string unused: messages logging WARNING: translation string unused: min size WARNING: translation string unused: missing dat @@ -392,6 +412,7 @@ WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS +WARNING: translation string unused: my new share WARNING: translation string unused: nat-traversal WARNING: translation string unused: net WARNING: translation string unused: net address @@ -399,6 +420,7 @@ WARNING: translation string unused: net config type WARNING: translation string unused: net config type help WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration +WARNING: translation string unused: netbios name WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed @@ -413,6 +435,7 @@ WARNING: translation string unused: no cfg upload WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver WARNING: translation string unused: no information available +WARNING: translation string unused: no log selected WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname @@ -478,6 +501,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: path to directory WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -487,6 +511,11 @@ WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe WARNING: translation string unused: present +WARNING: translation string unused: printcap name +WARNING: translation string unused: printer +WARNING: translation string unused: printername +WARNING: translation string unused: printing +WARNING: translation string unused: printing options WARNING: translation string unused: profiles WARNING: translation string unused: proxy WARNING: translation string unused: proxy access graphs @@ -496,6 +525,7 @@ WARNING: translation string unused: proxy port WARNING: translation string unused: psk WARNING: translation string unused: qos add subclass WARNING: translation string unused: quick control +WARNING: translation string unused: read list WARNING: translation string unused: reboot ask WARNING: translation string unused: reboot question WARNING: translation string unused: reboot schedule @@ -508,7 +538,10 @@ WARNING: translation string unused: reportlevel WARNING: translation string unused: requested data WARNING: translation string unused: reserved dst port WARNING: translation string unused: reserved src port +WARNING: translation string unused: reset shares +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: root WARNING: translation string unused: root path @@ -527,6 +560,7 @@ WARNING: translation string unused: selecttraffic WARNING: translation string unused: send email notification WARNING: translation string unused: send test mail WARNING: translation string unused: server reserved +WARNING: translation string unused: server string WARNING: translation string unused: service added WARNING: translation string unused: service removed WARNING: translation string unused: service updated @@ -535,7 +569,9 @@ WARNING: translation string unused: services settings WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas +WARNING: translation string unused: show last x lines WARNING: translation string unused: show lines +WARNING: translation string unused: show share options WARNING: translation string unused: shutdown ask WARNING: translation string unused: shutdown sure WARNING: translation string unused: shutdown2 @@ -546,6 +582,7 @@ WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits WARNING: translation string unused: snort working +WARNING: translation string unused: socket options WARNING: translation string unused: source ip bad WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net @@ -625,6 +662,7 @@ WARNING: translation string unused: tripwirewarningpolicy WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted +WARNING: translation string unused: unix charset WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -659,6 +697,7 @@ WARNING: translation string unused: use WARNING: translation string unused: use dov WARNING: translation string unused: use ibod WARNING: translation string unused: view log +WARNING: translation string unused: visible in browselist WARNING: translation string unused: vpn aggrmode WARNING: translation string unused: vpn configuration main WARNING: translation string unused: vpn delayed start @@ -674,6 +713,8 @@ WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards +WARNING: translation string unused: wins server +WARNING: translation string unused: wins support WARNING: translation string unused: wlanap access point WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error @@ -808,6 +849,7 @@ WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: dead peer detection = Dead Peer Detection WARNING: untranslated string: default = Default WARNING: untranslated string: default IP address = Default IP Address +WARNING: untranslated string: desired = Desired WARNING: untranslated string: details = Details WARNING: untranslated string: dh = Diffie-Hellman parameters WARNING: untranslated string: dh key move failed = Diffie-Hellman parameters move failed. @@ -1212,6 +1254,7 @@ WARNING: untranslated string: openvpn prefix local subnet = Using the prefix not WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0. WARNING: untranslated string: openvpn prefix remote subnet = Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0. WARNING: untranslated string: openvpn subnet is used = The given subnet is used by another OpenVPN server. +WARNING: untranslated string: optional = Optional WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Access WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead @@ -1256,6 +1299,7 @@ WARNING: untranslated string: random number generator daemon = Random Number Gen WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: received = Received WARNING: untranslated string: red1 = RED +WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string diff --git a/doc/language_issues.tr b/doc/language_issues.tr index ba5164cd6..047850ef2 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -40,11 +40,13 @@ WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network WARNING: translation string unused: add new ovpn +WARNING: translation string unused: add printer WARNING: translation string unused: add service WARNING: translation string unused: add subclass WARNING: translation string unused: add xtaccess WARNING: translation string unused: add-route WARNING: translation string unused: admin user password has been changed +WARNING: translation string unused: admin users WARNING: translation string unused: administrator user password WARNING: translation string unused: adsl settings WARNING: translation string unused: advproxy AUTH method ntlm @@ -161,6 +163,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem @@ -177,6 +180,7 @@ WARNING: translation string unused: could not open available updates file WARNING: translation string unused: could not open installed updates file WARNING: translation string unused: could not open update information file WARNING: translation string unused: create +WARNING: translation string unused: create mask WARNING: translation string unused: create new backup WARNING: translation string unused: current dynamic leases WARNING: translation string unused: current media @@ -217,8 +221,11 @@ WARNING: translation string unused: dhcp server enabled on blue interface WARNING: translation string unused: dial user password WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings +WARNING: translation string unused: directory mask +WARNING: translation string unused: directory writeable WARNING: translation string unused: disconnect WARNING: translation string unused: disconnects +WARNING: translation string unused: display charset WARNING: translation string unused: display traffic at home WARNING: translation string unused: display webinterface effects WARNING: translation string unused: dmz pinhole configuration @@ -248,6 +255,7 @@ WARNING: translation string unused: do not log this port list WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done +WARNING: translation string unused: dos charset WARNING: translation string unused: download dh parameter WARNING: translation string unused: download new ruleset WARNING: translation string unused: driver @@ -258,6 +266,7 @@ WARNING: translation string unused: eciadsl help WARNING: translation string unused: eciadsl upload WARNING: translation string unused: edit a rule WARNING: translation string unused: edit network +WARNING: translation string unused: edit printer WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg @@ -287,6 +296,7 @@ WARNING: translation string unused: esp encryption WARNING: translation string unused: esp grouptype WARNING: translation string unused: esp integrity WARNING: translation string unused: esp keylife +WARNING: translation string unused: exampel WARNING: translation string unused: expected WARNING: translation string unused: expertoptions WARNING: translation string unused: exportkey @@ -302,6 +312,7 @@ WARNING: translation string unused: filename WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update +WARNING: translation string unused: force user WARNING: translation string unused: forward firewall WARNING: translation string unused: forwarding rule added WARNING: translation string unused: forwarding rule removed @@ -367,11 +378,14 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface +WARNING: translation string unused: guest ok WARNING: translation string unused: gz with key WARNING: translation string unused: harddisk temperature graphs WARNING: translation string unused: hint WARNING: translation string unused: host +WARNING: translation string unused: host allow WARNING: translation string unused: host configuration +WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 @@ -409,6 +423,7 @@ WARNING: translation string unused: invalid port list WARNING: translation string unused: invalid time entered WARNING: translation string unused: invalid uplink speed WARNING: translation string unused: invalid upstream proxy username or password setting +WARNING: translation string unused: invalid users WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side @@ -428,6 +443,7 @@ WARNING: translation string unused: lang WARNING: translation string unused: lateprompting WARNING: translation string unused: length WARNING: translation string unused: line +WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk WARNING: translation string unused: localkey @@ -436,7 +452,9 @@ WARNING: translation string unused: locationblock country code WARNING: translation string unused: locationblock country name WARNING: translation string unused: locationblock flag WARNING: translation string unused: log enabled +WARNING: translation string unused: log level WARNING: translation string unused: log var messages +WARNING: translation string unused: log view WARNING: translation string unused: log viewer WARNING: translation string unused: logging WARNING: translation string unused: loosedirectorychecking @@ -454,6 +472,7 @@ WARNING: translation string unused: mac address error not 00 WARNING: translation string unused: mailmethod WARNING: translation string unused: mailprogramm WARNING: translation string unused: manage ovpn +WARNING: translation string unused: manage printers WARNING: translation string unused: manual WARNING: translation string unused: manual control and status WARNING: translation string unused: marked @@ -464,6 +483,7 @@ WARNING: translation string unused: mbmon fan in WARNING: translation string unused: mbmon graphs WARNING: translation string unused: mbmon temp in WARNING: translation string unused: mbmon value +WARNING: translation string unused: meaning WARNING: translation string unused: messages logging WARNING: translation string unused: min size WARNING: translation string unused: missing dat @@ -483,6 +503,7 @@ WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS +WARNING: translation string unused: my new share WARNING: translation string unused: nat-traversal WARNING: translation string unused: net WARNING: translation string unused: net address @@ -490,6 +511,7 @@ WARNING: translation string unused: net config type WARNING: translation string unused: net config type help WARNING: translation string unused: net traffic newversion WARNING: translation string unused: net-traffic configuration +WARNING: translation string unused: netbios name WARNING: translation string unused: network added WARNING: translation string unused: network configuration WARNING: translation string unused: network removed @@ -506,6 +528,7 @@ WARNING: translation string unused: no eciadsl synch.bin file WARNING: translation string unused: no fritzdsl driver WARNING: translation string unused: no hardware random number generator WARNING: translation string unused: no information available +WARNING: translation string unused: no log selected WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname @@ -584,6 +607,7 @@ WARNING: translation string unused: pakfire updates WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length +WARNING: translation string unused: path to directory WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -593,6 +617,11 @@ WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe WARNING: translation string unused: present +WARNING: translation string unused: printcap name +WARNING: translation string unused: printer +WARNING: translation string unused: printername +WARNING: translation string unused: printing +WARNING: translation string unused: printing options WARNING: translation string unused: profiles WARNING: translation string unused: proxy WARNING: translation string unused: proxy access graphs @@ -602,6 +631,7 @@ WARNING: translation string unused: proxy port WARNING: translation string unused: psk WARNING: translation string unused: qos add subclass WARNING: translation string unused: quick control +WARNING: translation string unused: read list WARNING: translation string unused: reboot ask WARNING: translation string unused: reboot question WARNING: translation string unused: reboot schedule @@ -614,7 +644,10 @@ WARNING: translation string unused: reportlevel WARNING: translation string unused: requested data WARNING: translation string unused: reserved dst port WARNING: translation string unused: reserved src port +WARNING: translation string unused: reset shares +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: root WARNING: translation string unused: root path @@ -633,6 +666,7 @@ WARNING: translation string unused: selecttraffic WARNING: translation string unused: send email notification WARNING: translation string unused: send test mail WARNING: translation string unused: server reserved +WARNING: translation string unused: server string WARNING: translation string unused: service added WARNING: translation string unused: service removed WARNING: translation string unused: service updated @@ -641,7 +675,9 @@ WARNING: translation string unused: services settings WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas +WARNING: translation string unused: show last x lines WARNING: translation string unused: show lines +WARNING: translation string unused: show share options WARNING: translation string unused: shutdown ask WARNING: translation string unused: shutdown sure WARNING: translation string unused: shutdown2 @@ -652,6 +688,7 @@ WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits WARNING: translation string unused: snort working +WARNING: translation string unused: socket options WARNING: translation string unused: source ip bad WARNING: translation string unused: source ip in use WARNING: translation string unused: source ip or net @@ -740,6 +777,7 @@ WARNING: translation string unused: tripwirewarningpolicy WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted +WARNING: translation string unused: unix charset WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -778,6 +816,7 @@ WARNING: translation string unused: use WARNING: translation string unused: use dov WARNING: translation string unused: use ibod WARNING: translation string unused: view log +WARNING: translation string unused: visible in browselist WARNING: translation string unused: vpn aggrmode WARNING: translation string unused: vpn configuration main WARNING: translation string unused: vpn delayed start @@ -794,6 +833,8 @@ WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards +WARNING: translation string unused: wins server +WARNING: translation string unused: wins support WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert @@ -821,6 +862,7 @@ WARNING: untranslated string: crypto error = Cryptographic error WARNING: untranslated string: crypto warning = Cryptographic warning WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: default IP address = Default IP Address +WARNING: untranslated string: desired = Desired WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dns = unknown string WARNING: untranslated string: dns check servers = Check DNS Servers @@ -927,6 +969,7 @@ WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: not affected = Not Affected WARNING: untranslated string: not validating = Not validating WARNING: untranslated string: open connections = Open Connections +WARNING: untranslated string: optional = Optional WARNING: untranslated string: ovpn connection name = Connection Name WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs to be in minimum 2048 bit!
Please generate or upload a new Diffie-Hellman parameter, this can be made below in the section "Diffie-Hellman parameters options".
WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore.
Please update to the latest IPFire version and generate a new root and host certificate.

All OpenVPN clients needs then to be renewed!
@@ -942,6 +985,7 @@ WARNING: untranslated string: please reboot to apply your changes = Please reboo WARNING: untranslated string: processor vulnerability mitigations = Processor Vulnerability Mitigations WARNING: untranslated string: ptr = PTR WARNING: untranslated string: received = Received +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 diff --git a/doc/language_missings b/doc/language_missings index 01f95d7f9..253e87b33 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -27,6 +27,7 @@ < choose media < could not connect to www ipfire org < cryptographic settings +< desired < dhcp server disabled on blue interface < dhcp server enabled on blue interface < dh name is invalid @@ -39,7 +40,9 @@ < no entries < notes < okay +< optional < quick control +< required < shaping add options < show areas < show lines @@ -203,6 +206,7 @@ < default ip < default IP address < deprecated fs warn +< desired < details < dh < dhcp dns enable update @@ -639,6 +643,7 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< optional < other < our donors < outgoing compression in bytes per second @@ -711,6 +716,7 @@ < rdns < received < red1 +< required < required field < runmode < samba join a domain @@ -922,8 +928,11 @@ < ansi t1.483 < bewan adsl pci st < bewan adsl usb +< desired < g.dtm < g.lite +< optional +< required < upload fcdsl.o ############################################################################ # Checking cgi-bin translations for language: it # @@ -1010,6 +1019,7 @@ < Daily < dangerous < default IP address +< desired < dhcp dns enable update < dhcp dns key name < dhcp dns update @@ -1166,6 +1176,7 @@ < one week < one year < open connections +< optional < outgoing compression in bytes per second < outgoing overhead in bytes per second < ovpn add conf @@ -1188,6 +1199,7 @@ < ptr < rdns < received +< required < required field < runmode < samba join a domain @@ -1369,6 +1381,7 @@ < dangerous < default < default IP address +< desired < dh < dhcp dns enable update < dhcp dns key name @@ -1560,6 +1573,7 @@ < one week < one year < open connections +< optional < outgoing compression in bytes per second < outgoing overhead in bytes per second < ovpn add conf @@ -1592,6 +1606,7 @@ < random number generator daemon < rdns < received +< required < required field < runmode < samba join a domain @@ -1845,6 +1860,7 @@ < default ip < default IP address < deprecated fs warn +< desired < details < dh < dhcp dns enable update @@ -2283,6 +2299,7 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< optional < other < our donors < outgoing compression in bytes per second @@ -2341,6 +2358,7 @@ < rdns < received < red1 +< required < required field < runmode < samba join a domain @@ -2699,6 +2717,7 @@ < default ip < default IP address < deprecated fs warn +< desired < details < dh < dhcp dns enable update @@ -3143,6 +3162,7 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< optional < other < our donors < outgoing compression in bytes per second @@ -3198,6 +3218,7 @@ < rdns < received < red1 +< required < required field < runmode < samba join a domain @@ -3424,6 +3445,7 @@ < Daily < dangerous < default IP address +< desired < Disabled < disconnected < dns check servers @@ -3500,6 +3522,7 @@ < not validating < okay < open connections +< optional < ovpn connection name < ovpn error dh < ovpn error md5 @@ -3515,6 +3538,7 @@ < processor vulnerability mitigations < ptr < received +< required < runmode < sent < smt disabled diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index c0485b48d..78efc5175 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -85,6 +85,7 @@ $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; +$sambasettings{'ENCRYPTION'} = 'optional'; ### Values that have to be initialized $sambasettings{'ACTION'} = ''; my $LOGLINES = '50'; @@ -198,14 +199,20 @@ logging = syslog preferred master = $sambasettings{'PREFERREDMASTER'} domain master = $sambasettings{'DOMAINMASTER'} local master = $sambasettings{'LOCALMASTER'} +END +; + +if ($sambasettings{'ENCRYPTION'} =~ m/(desired|required)/) { + print FILE "smb encrypt = $1\n"; +} +print FILE <ADS +$Lang::tr{'encryption'} $Lang::tr{'map to guest'} -$Lang::tr{'interfaces'}on / - off | - OpenVpn - $ovpnip[0].$ovpnip[1].$ovpnip[2].$ovpnip[3]/$ovpnnetwork[1] -on / - off | - $Lang::tr{'green'} - $netsettings{'GREEN_DEV'} -END -; - -if (&Header::blue_used()) - { - print <on / - off | - $Lang::tr{'wireless'} - $netsettings{'BLUE_DEV'} -END -; - } - -if (&Header::orange_used()) - { - print <on / - off | - $Lang::tr{'dmz'} - $netsettings{'ORANGE_DEV'} -END -; - } - print <$Lang::tr{'more'}
Wide linkson / off From patchwork Tue Oct 13 16:07:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3549 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTV3NdJz3x1S for ; Tue, 13 Oct 2020 16:09:02 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSs4sbRz1Kd; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSp30bCz305B; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSn00wjz304y for ; Tue, 13 Oct 2020 16:08:25 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSl4HLPz1H9; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6RtQIkoasgbCPFEAXHS2hEkF1v036Rs7TDrZ9RMtnwA=; b=uip8UBDW+WJji/gNzB3o3mYz15al4tAzquCVjKfX7OWPrXdwL5DDoqxf0ELH7UH0OLeny0 mQVZkIruMU0VLoDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6RtQIkoasgbCPFEAXHS2hEkF1v036Rs7TDrZ9RMtnwA=; b=PW5NjfixBdnV2q3GmnunPLgP8559DPayU3NPj4nTOLCe/kZmjLsI0phZzmy85DrtKZhJ3q gc5OB1ANOYp/tlDh2c0USOqu4MD4FCookEbDVpb7cpSaF18UyJLfraI/dn259U9vXym2dl ozJmAtAmu/WaLEZ44Skw5eUOVcKHcyzoUXhUElFU7PHISLQMfyZsegLaDUmQsdBSIdIQ5K GKs+jROIruuizt3VYJsHmge4qxFTUwvVUzwfEFTXdQYP4Ak2rrvCFgkdCAvZTMsbkfL7o9 YwEWELWZuL2sq3RTz8EOY8ioipdu52BK6L+U9o90vn9cNf6ewgrAvh7UYbxHBQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 24/54] samba: Drop support for being PDC for Windows NT domains Date: Tue, 13 Oct 2020 16:07:42 +0000 Message-Id: <20201013160812.27754-24-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is outdated, and nobody uses it Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 119 +++++------------------------------------ 1 file changed, 13 insertions(+), 106 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 902ae6eac..2c2c506e5 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -93,7 +93,6 @@ my $LOGLINES = '50'; ################################################## Samba PDC Variablen ##################################################### $sambasettings{'LOCALMASTER'} = 'off'; -$sambasettings{'DOMAINMASTER'} = 'off'; $sambasettings{'PREFERREDMASTER'} = 'off'; my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; @@ -152,7 +151,6 @@ delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasetting if ($sambasettings{'PASSWORDSYNC'} eq 'on'){ $sambasettings{'PASSWORDSYNC'} = "true";} else { $sambasettings{'PASSWORDSYNC'} = "false";} if ($sambasettings{'LOCALMASTER'} eq 'on'){ $sambasettings{'LOCALMASTER'} = "true";} else { $sambasettings{'LOCALMASTER'} = "false";} -if ($sambasettings{'DOMAINMASTER'} eq 'on'){ $sambasettings{'DOMAINMASTER'} = "true";} else { $sambasettings{'DOMAINMASTER'} = "false";} if ($sambasettings{'PREFERREDMASTER'} eq 'on'){ $sambasettings{'PREFERREDMASTER'} = "true";} else { $sambasettings{'PREFERREDMASTER'} = "false";} if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} = "yes";} else { $sambasettings{'WIDELINKS'} = "no";} if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'} = "yes";} else { $sambasettings{'UNIXEXTENSION'} = "no";} @@ -197,7 +195,6 @@ winbind use default domain = yes logging = syslog preferred master = $sambasettings{'PREFERREDMASTER'} -domain master = $sambasettings{'DOMAINMASTER'} local master = $sambasettings{'LOCALMASTER'} END ; @@ -215,27 +212,9 @@ printable = yes END close FILE; -if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ) - { - open (FILE, ">${General::swroot}/samba/pdc") or die "Can't save the pdc settings: $!"; - flock (FILE, 2); - chomp $sambasettings{'PDCOPTIONS'}; - $sambasettings{'PDCOPTIONS'} =~ s/\r\n/\n/gi; - $sambasettings{'PDCOPTIONS'} =~ s/^\n//gi; - $sambasettings{'PDCOPTIONS'} =~ s/^\r//gi; - $sambasettings{'PDCOPTIONS'} =~ s/^.\n//gi; - $sambasettings{'PDCOPTIONS'} =~ s/^.\r//gi; - print FILE < $Lang::tr{'basic options'} $Lang::tr{'workgroup'} -print <
Wide linkson / off @@ -346,7 +321,6 @@ print <$Lang::tr{'security options'} $Lang::tr{'security'} @@ -377,25 +351,12 @@ if ($sambasettings{'SECURITY'} eq 'user') print <$Lang::tr{'local master'}on / off -$Lang::tr{'domain master'}on / - off $Lang::tr{'prefered master'}on / off END ; } -if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'on') - { - print <
- $Lang::tr{'pdc options'} -
- -END -; - } - print <
@@ -430,14 +391,7 @@ END if ($sambasettings{'SECURITY'} eq 'user') { - if ($sambasettings{'DOMAINMASTER'} eq 'off') - { - &Header::openbox('100%', 'center', $Lang::tr{'accounting user nonpdc'}); - } - else - { - &Header::openbox('100%', 'center', $Lang::tr{'accounting user pdc'}); - } + &Header::openbox('100%', 'center', $Lang::tr{'user management'}); print <
@@ -448,15 +402,7 @@ if ($sambasettings{'SECURITY'} eq 'user') END ; - if ($sambasettings{'DOMAINMASTER'} eq 'off') - { - print ""; - } - else - { - print "$Lang::tr{'type'}"; - } - + print ""; print "$Lang::tr{'status'}$Lang::tr{'options'}"; system('/usr/local/bin/sambactrl readsmbpasswd'); open(FILE, "<${General::swroot}/samba/private/smbpasswd") or die "Can't read user file: $!"; @@ -480,21 +426,7 @@ END print "$Lang::tr{'set'}"; } - if ($sambasettings{'DOMAINMASTER'} eq 'off') - { - print ""; - } - else - { - if ($userline[0] =~ /\$/) - { - print "$Lang::tr{'pc'}"; - } - else - { - print "$Lang::tr{'user'}"; - } - } + print ""; if ($userline[4] =~ /D/) { @@ -537,28 +469,14 @@ END ; } - if ($sambasettings{'DOMAINMASTER'} eq 'on' && $userline[0] =~ /\$/) - { - print <
- - - -
-END -; - } - else - { - print <
- - - -
+ print <
+ + + +
END ; - } $lines++; } print <
- -
-END -; - } print <
@@ -930,9 +839,7 @@ if ( $smb eq 'shares') close FILE; -if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");} - else{system("/usr/local/bin/sambactrl smbsafeconf");} - +system("/usr/local/bin/sambactrl smbsafeconf"); system("/usr/local/bin/sambactrl smbreload"); refreshpage(); } From patchwork Tue Oct 13 16:07:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3551 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTX6SGHz3x3M for ; Tue, 13 Oct 2020 16:09:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSv2gdvz1JH; Tue, 13 Oct 2020 16:08:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSq4V5Mz304N; Tue, 13 Oct 2020 16:08:27 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSn4VT7z2y3n for ; Tue, 13 Oct 2020 16:08:25 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSm31wRz1Gj; Tue, 13 Oct 2020 16:08:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uw0iJ9RstgTPvxmfPe6f0xHwbr0dDlDyi1ysbg5+Go8=; b=FzpP9W/NmjothjZPDAaChqoR4ml2vVeEFDm4u67CmLqUr0/6PrrtjrIRXeXojaU7PAStVG TwCX839rW8C6WgCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uw0iJ9RstgTPvxmfPe6f0xHwbr0dDlDyi1ysbg5+Go8=; b=OVEGDDuXR0PzzHAxojbRMVMbjomltwul73TYADh7aVRLPpHkEVmyo2tEiGJAdk7GNUEIu6 yZchZJgTw5bVwf3I8NmPgPVuzCvfs3dRxxFjWYSqu+drindgFA9LxRM3YsJlYxSdTorGFz 5meE8/8cMzKIwVxls8PmWnPDtInh0I6QEEfyrcv53qSddw8FVRMrbs8KKg/1sjxyszfH3A runk8VeJvkNVG39G5S6oH8+nHliVZfu97aOu30Qls8t+S5LAMhctHJGfH/Mge8RXDK0p2e N/GsRu2Y7ZHgAE0lmyj2ADlJTzyyLYDkbVWYdl5cmrx2b/e0GUWRs8Ecc/yP2A== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 25/54] samba: Remove local master option Date: Tue, 13 Oct 2020 16:07:43 +0000 Message-Id: <20201013160812.27754-25-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" It is not a good default to withdraw samba from the race of becoming the local master browser. There is no reason why it couldn't be. Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 8 -------- 1 file changed, 8 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 2c2c506e5..2d9ebc367 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -92,7 +92,6 @@ my $LOGLINES = '50'; ################################################## Samba PDC Variablen ##################################################### -$sambasettings{'LOCALMASTER'} = 'off'; $sambasettings{'PREFERREDMASTER'} = 'off'; my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; @@ -150,7 +149,6 @@ delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasetting &General::writehash("${General::swroot}/samba/settings", \%sambasettings); if ($sambasettings{'PASSWORDSYNC'} eq 'on'){ $sambasettings{'PASSWORDSYNC'} = "true";} else { $sambasettings{'PASSWORDSYNC'} = "false";} -if ($sambasettings{'LOCALMASTER'} eq 'on'){ $sambasettings{'LOCALMASTER'} = "true";} else { $sambasettings{'LOCALMASTER'} = "false";} if ($sambasettings{'PREFERREDMASTER'} eq 'on'){ $sambasettings{'PREFERREDMASTER'} = "true";} else { $sambasettings{'PREFERREDMASTER'} = "false";} if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} = "yes";} else { $sambasettings{'WIDELINKS'} = "no";} if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'} = "yes";} else { $sambasettings{'UNIXEXTENSION'} = "no";} @@ -195,7 +193,6 @@ winbind use default domain = yes logging = syslog preferred master = $sambasettings{'PREFERREDMASTER'} -local master = $sambasettings{'LOCALMASTER'} END ; @@ -242,9 +239,6 @@ if ($message) { $checked{'PASSWORDSYNC'}{'off'} = ''; $checked{'PASSWORDSYNC'}{'on'} = ''; $checked{'PASSWORDSYNC'}{$sambasettings{'PASSWORDSYNC'}} = "checked='checked'"; -$checked{'LOCALMASTER'}{'off'} = ''; -$checked{'LOCALMASTER'}{'on'} = ''; -$checked{'LOCALMASTER'}{$sambasettings{'LOCALMASTER'}} = "checked='checked'"; $checked{'PREFERREDMASTER'}{'off'} = ''; $checked{'PREFERREDMASTER'}{'on'} = ''; $checked{'PREFERREDMASTER'}{$sambasettings{'PREFERREDMASTER'}} = "checked='checked'"; @@ -349,8 +343,6 @@ END if ($sambasettings{'SECURITY'} eq 'user') { print <$Lang::tr{'local master'}on / - off $Lang::tr{'prefered master'}on / off END From patchwork Tue Oct 13 16:07:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3553 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTc6w9Zz3x1S for ; Tue, 13 Oct 2020 16:09:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSv2sfCz1L2; Tue, 13 Oct 2020 16:08:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSq55pgz305g; Tue, 13 Oct 2020 16:08:27 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSn5wTRz2y3n for ; Tue, 13 Oct 2020 16:08:25 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSm4spGz1HY; Tue, 13 Oct 2020 16:08:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3ckksluJ6qu43q6ltjF32/we5BPyJlb+afEcVdBygCg=; b=6cqyCanEsZvT5hAk6tugkkfoCZ1fVnpJA0ozQb80y6jLYTrepzuwqKbNjIDCsft/EjBq4R Z5tTQeQABcXeO3AA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3ckksluJ6qu43q6ltjF32/we5BPyJlb+afEcVdBygCg=; b=eLDzvGxM62sGEHyCxq1izD2DASap6jtg3YXPGCOg/4YGY18xmXKog15b6bupz+kGNrn93m zQJEbal0pfujranJRpOhvrUoAM4+akPP/GK4GJPSN3e1QmBWSp6nRVT/aHI0ZrB0iEOEvS EfgbtUHcaOPFqBPu7hgh4ST6Q4U1Ks8UA7josQ6UObdhGZwe6k/m2GlY4fciaNgituafSQ O3hhneEiW+8NeXRDM6WsA7i5FBtzpSsTVf+G6SH8UC5o8MyDaN57Xip1GgSSqhXuHcVsod ffEXYB1ChNe2wnDm2pkRtbLCQ8njy2mCoc8R4XZsF4a22n4BsYwxu/DN3f6xOA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 26/54] samba: Remove preferred master option Date: Tue, 13 Oct 2020 16:07:44 +0000 Message-Id: <20201013160812.27754-26-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is no longer relevant since we cannot run in domain mode any longer. Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 2d9ebc367..062b4c85a 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -92,7 +92,6 @@ my $LOGLINES = '50'; ################################################## Samba PDC Variablen ##################################################### -$sambasettings{'PREFERREDMASTER'} = 'off'; my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; @@ -149,7 +148,6 @@ delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasetting &General::writehash("${General::swroot}/samba/settings", \%sambasettings); if ($sambasettings{'PASSWORDSYNC'} eq 'on'){ $sambasettings{'PASSWORDSYNC'} = "true";} else { $sambasettings{'PASSWORDSYNC'} = "false";} -if ($sambasettings{'PREFERREDMASTER'} eq 'on'){ $sambasettings{'PREFERREDMASTER'} = "true";} else { $sambasettings{'PREFERREDMASTER'} = "false";} if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} = "yes";} else { $sambasettings{'WIDELINKS'} = "no";} if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'} = "yes";} else { $sambasettings{'UNIXEXTENSION'} = "no";} @@ -192,7 +190,6 @@ winbind use default domain = yes # Log to syslog logging = syslog -preferred master = $sambasettings{'PREFERREDMASTER'} END ; @@ -239,9 +236,6 @@ if ($message) { $checked{'PASSWORDSYNC'}{'off'} = ''; $checked{'PASSWORDSYNC'}{'on'} = ''; $checked{'PASSWORDSYNC'}{$sambasettings{'PASSWORDSYNC'}} = "checked='checked'"; -$checked{'PREFERREDMASTER'}{'off'} = ''; -$checked{'PREFERREDMASTER'}{'on'} = ''; -$checked{'PREFERREDMASTER'}{$sambasettings{'PREFERREDMASTER'}} = "checked='checked'"; $checked{'WIDELINKS'}{'off'} = ''; $checked{'WIDELINKS'}{'on'} = ''; $checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} = "checked='checked'"; @@ -337,19 +331,6 @@ print <$Lang::tr{'os level'} $Lang::tr{'remote announce'} $Lang::tr{'remote browse sync'} -END -; - -if ($sambasettings{'SECURITY'} eq 'user') - { - print <$Lang::tr{'prefered master'}on / - off -END -; - } - -print <
From patchwork Tue Oct 13 16:07:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3552 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTb2L3Yz3x1S for ; Tue, 13 Oct 2020 16:09:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSv328Nz1MD; Tue, 13 Oct 2020 16:08:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSq5hFVz2yyR; Tue, 13 Oct 2020 16:08:27 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSp5hb7z304W for ; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSm6W4hz1Hg; Tue, 13 Oct 2020 16:08:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OfzGGzgrrPQYI5+0BDf3AsgEiTkyd2iXzB1sgWAODM8=; b=+rJoAieVaI5J/CF0RuKgZqg54yFKBitzGLp5hQ0ISqeulWPVPKpjlhtgElclkH0GdFoh4U Ozv+0/rFeZk1HAAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OfzGGzgrrPQYI5+0BDf3AsgEiTkyd2iXzB1sgWAODM8=; b=g9Px5O8sxplTNlyIg95m6rdSflDDI5aIs9giGzly1U30DGdTKTWZY35tJGUrCcmWk7nu9F 7d//jY6w+l7N/eioXY+0kHJov+HGMzBVkiqyr0/iyzuWQAGVtk2rS2Mfy+9Ond4SEQCrFT dK2o4W3PzZnaSWFqjmcAK2T+qLz4dhamrypntQ0GJANeyZRrCD95IeJX08BcRCIddH6oew sBzuwlgJjBrybn3YyJryCMZJz/iyBtQMIO2LlO9YE0QwwpkbEoInkcv9WOUmdpa8hmEIo8 n4Zk2ukabchKj/7aE92WZ+tQjOwOhFkFCnXrCCfEhS/8nfqtZGP4gjdyAg2Fvg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 27/54] samba: Drop PDC default configuration Date: Tue, 13 Oct 2020 16:07:45 +0000 Message-Id: <20201013160812.27754-27-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/packages/aarch64/samba | 1 - config/rootfiles/packages/armv5tel/samba | 1 - config/rootfiles/packages/i586/samba | 1 - config/rootfiles/packages/x86_64/samba | 1 - config/samba/pdc | 19 ------------------- html/cgi-bin/samba.cgi | 5 ----- 6 files changed, 28 deletions(-) delete mode 100644 config/samba/pdc diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index 4ee93218e..0742d11f0 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -794,7 +794,6 @@ usr/sbin/winbindd var/ipfire/backup/addons/includes/samba #var/ipfire/samba var/ipfire/samba/global -var/ipfire/samba/pdc #var/ipfire/samba/private var/ipfire/samba/private/secrets.tdb var/ipfire/samba/private/smbpasswd diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba index 471d81982..80ee5d6f7 100644 --- a/config/rootfiles/packages/armv5tel/samba +++ b/config/rootfiles/packages/armv5tel/samba @@ -794,7 +794,6 @@ usr/sbin/winbindd var/ipfire/backup/addons/includes/samba #var/ipfire/samba var/ipfire/samba/global -var/ipfire/samba/pdc #var/ipfire/samba/private var/ipfire/samba/private/secrets.tdb var/ipfire/samba/private/smbpasswd diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba index 73057db97..4beb655ea 100644 --- a/config/rootfiles/packages/i586/samba +++ b/config/rootfiles/packages/i586/samba @@ -794,7 +794,6 @@ usr/sbin/winbindd var/ipfire/backup/addons/includes/samba #var/ipfire/samba var/ipfire/samba/global -var/ipfire/samba/pdc #var/ipfire/samba/private var/ipfire/samba/private/secrets.tdb var/ipfire/samba/private/smbpasswd diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index 1940211d6..d97dea9bc 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -794,7 +794,6 @@ usr/sbin/winbindd var/ipfire/backup/addons/includes/samba #var/ipfire/samba var/ipfire/samba/global -var/ipfire/samba/pdc #var/ipfire/samba/private var/ipfire/samba/private/secrets.tdb var/ipfire/samba/private/smbpasswd diff --git a/config/samba/pdc b/config/samba/pdc deleted file mode 100644 index 73d2c4f9b..000000000 --- a/config/samba/pdc +++ /dev/null @@ -1,19 +0,0 @@ -[homes] -path = /home/%U -comment = Benutzer-Verzeichnisse -browseable = yes -writeable = yes -valid users = %U - -[netlogon] -path = /var/ipfire/samba/netlogon -browseable = no -writeable = no -comment = NetLogON - -[profiles] -path = /var/ipfire/samba/profiles -browseable = no -writeable = yes -comment = Benutzerprofile -valid users = %U diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 062b4c85a..5f177963c 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -90,11 +90,6 @@ $sambasettings{'ENCRYPTION'} = 'optional'; $sambasettings{'ACTION'} = ''; my $LOGLINES = '50'; -################################################## Samba PDC Variablen ##################################################### - -my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; - - ############################################################################################################################ &General::readhash("${General::swroot}/samba/settings", \%sambasettings); From patchwork Tue Oct 13 16:07:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3554 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTh2rW3z3x1S for ; Tue, 13 Oct 2020 16:09:12 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSw2Fzxzwn; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSs6c1Xz2y5K; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSq1s7pz2ygm for ; Tue, 13 Oct 2020 16:08:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSn351Qz1Hl; Tue, 13 Oct 2020 16:08:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OB6ghwO+ZA3jBlIZkdCCcmWXK515d7WCQi8wjbE5rj4=; b=pyiy2Vwj/ZLXG4ZXvKIj8TDbTKD0hqCEkbFXHU4Q4BvFyjhRGMEH1PXqqlLpE/2D6KjMMG Uxuwn0jKh7hvB49NX/TDSpzeZWSmStcmh4pAh22002JPhEVJTkOpMVoITYneQG/Vl7v/c2 BHHRz2uppsR7zWoZVqzkOHGpQTUswNb4NLIRrwX4aNhDfNEPbjWNuocZ+KDpVjfh7twscV ZMjGiFG8gUHHUpTfca/D2zbR7D75AgFIeAcV59X9TNVqDWMWsuFHmtvl3DUY5acV6sf9KQ F0T1jxjKfaKLWENMq6qeldq7UiiHvnMWnAFkaM1lJoRAwwwgXcoLmxlnOVvxjg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OB6ghwO+ZA3jBlIZkdCCcmWXK515d7WCQi8wjbE5rj4=; b=MaeitAcOpNU1S0DI4sgadIV60qLfNnb9LJcDA6dtLzMiK1nJNu/D9IOLmfVfXXebbTpBoG uI+CDjd9dBD2WyCQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 28/54] samba: Remove OS level Date: Tue, 13 Oct 2020 16:07:46 +0000 Message-Id: <20201013160812.27754-28-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Samba will chose this automatically and the documentation advises against changing the default. Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 3 --- 1 file changed, 3 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 5f177963c..536d7f1d6 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -72,7 +72,6 @@ my %servicenames = ('SMB Daemon' => 'smbd', 'NetBIOS Nameserver' => 'nmbd', 'Win $sambasettings{'WORKGRP'} = 'homeip.net'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'user'; -$sambasettings{'OSLEVEL'} = '33'; $sambasettings{'GREEN'} = 'on'; $sambasettings{'BLUE'} = 'off'; $sambasettings{'ORANGE'} = 'off'; @@ -164,7 +163,6 @@ passdb backend = smbpasswd wide links = $sambasettings{'WIDELINKS'} unix extensions = $sambasettings{'UNIXEXTENSION'} -os level = $sambasettings{'OSLEVEL'} map to guest = $sambasettings{'MAPTOGUEST'} @@ -323,7 +321,6 @@ END print < -

$Lang::tr{'network options'}
$Lang::tr{'os level'}
$Lang::tr{'remote announce'}
$Lang::tr{'remote browse sync'}
From patchwork Tue Oct 13 16:07:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3555 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTk0kP5z3x1S for ; Tue, 13 Oct 2020 16:09:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSw4gKtz1Jk; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSt0CCHz304l; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSq5KMHz305j for ; Tue, 13 Oct 2020 16:08:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSn5xcKz1Gj; Tue, 13 Oct 2020 16:08:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KhRBMAadqXDJ7zQm1wYqfcUUs6h3VXCG4BFJd4SLYNg=; b=QqDoC8QldoRMFnVY6xA2LYoUwZPPH4TAwyHNvaC0hIRE9T+N4q3KhyQgQt0ZRvPiBZP2l7 ZDRE7jQWGfKIgm3qLQcmGAh/rVxnXFIdI26JLoHO3cEXoa4DQFvXZtKP44QKg5DUCLQS20 CQ9v3WVQTC702pm77QctrX5iyLm4XIxk2VX+MZpwQKpPcAKepvamA50STR/XMabXk7foI3 +THVPM5WshQhBcazlvCg9HS9QF7Eh22/9L9otWoDTZ8dOpukfh7HiT2oOEHFca1zuQQQdR RZeP2ZNADlAuQRVgWS98XXcbmJDl0EAq1iNZWHJR+cNspbNvJiL1HdfsBnybpQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KhRBMAadqXDJ7zQm1wYqfcUUs6h3VXCG4BFJd4SLYNg=; b=cRIF9TqfyEylRE2oo0A8GPLBJfu428bbqnH4kIBHeBxOd7J6wBn0yka14GYbcIdD5FGof5 WYslx4LvUldv/HBA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 29/54] samba: Remove move unused network variables Date: Tue, 13 Oct 2020 16:07:47 +0000 Message-Id: <20201013160812.27754-29-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 536d7f1d6..5d0d95b38 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -32,7 +32,6 @@ my %sambasettings = (); my %cgisettings = (); my %checked = (); my %netsettings = (); -my %ovpnsettings = (); my %color = (); my %mainsettings = (); my $message = ""; @@ -51,14 +50,9 @@ my $defaultoption= "[Share]\npath = /var/ipfire/samba/share1\ncomment = Share - my %shares = (); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); -&General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings); &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); -my @ovpnnetwork = split(/\//,$ovpnsettings{'DOVPN_SUBNET'}); -my @ovpnip = split(/\./,$ovpnnetwork[0]); -$ovpnip[3]=$ovpnip[3]+1; - ############################################################################################################################ ############################################# Samba Dienste fr Statusberprfung ########################################## @@ -72,14 +66,9 @@ my %servicenames = ('SMB Daemon' => 'smbd', 'NetBIOS Nameserver' => 'nmbd', 'Win $sambasettings{'WORKGRP'} = 'homeip.net'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'user'; -$sambasettings{'GREEN'} = 'on'; -$sambasettings{'BLUE'} = 'off'; -$sambasettings{'ORANGE'} = 'off'; -$sambasettings{'VPN'} = 'off'; $sambasettings{'REMOTEANNOUNCE'} = ''; $sambasettings{'REMOTESYNC'} = ''; $sambasettings{'PASSWORDSYNC'} = 'off'; -$sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'WIDELINKS'} = 'on'; @@ -128,13 +117,6 @@ if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl s if ($sambasettings{'ACTION'} eq $Lang::tr{'save'}) { -$sambasettings{'INTERFACES'} = ''; -if ($sambasettings{'GREEN'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'GREEN_DEV'}";} -if ($sambasettings{'BLUE'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'BLUE_DEV'}";} -if ($sambasettings{'ORANGE'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'ORANGE_DEV'}";} -if ($sambasettings{'VPN'} eq 'on'){$sambasettings{'INTERFACES'} .= " ";} -if ($sambasettings{'OTHERINTERFACES'} ne ''){ $sambasettings{'INTERFACES'} .= " $sambasettings{'OTHERINTERFACES'}";} - ############################################################################################################################ ##################################### Schreiben settings und bersetzen fr smb.conf ####################################### @@ -235,18 +217,6 @@ $checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} = "checked='checked'"; $checked{'UNIXEXTENSION'}{'off'} = ''; $checked{'UNIXEXTENSION'}{'on'} = ''; $checked{'UNIXEXTENSION'}{$sambasettings{'UNIXEXTENSION'}} = "checked='checked'"; -$checked{'GREEN'}{'off'} = ''; -$checked{'GREEN'}{'on'} = ''; -$checked{'GREEN'}{$sambasettings{'GREEN'}} = "checked='checked'"; -$checked{'BLUE'}{'off'} = ''; -$checked{'BLUE'}{'on'} = ''; -$checked{'BLUE'}{$sambasettings{'BLUE'}} = "checked='checked'"; -$checked{'ORANGE'}{'off'} = ''; -$checked{'ORANGE'}{'on'} = ''; -$checked{'ORANGE'}{$sambasettings{'ORANGE'}} = "checked='checked'"; -$checked{'VPN'}{'off'} = ''; -$checked{'VPN'}{'on'} = ''; -$checked{'VPN'}{$sambasettings{'VPN'}} = "checked='checked'"; $selected{'ENCRYPTION'}{'optional'} = ''; $selected{'ENCRYPTION'}{'desired'} = ''; $selected{'ENCRYPTION'}{'required'} = ''; From patchwork Tue Oct 13 16:07:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3558 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTq0Xcdz3x1S for ; Tue, 13 Oct 2020 16:09:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSw4qz1z1RQ; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSt0lwyz3051; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSr0GMNz305d for ; Tue, 13 Oct 2020 16:08:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSp0v39z1Hr; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QlB0TW4trPmI0VG40Uv5sEi2P2hMXNPHshtVYD1GmwY=; b=WfINqqoDmpcN6ZRtlrBLOTEjdKzcVARhm13C/jhk3royefLti4SMQAuHXd+yqLFIW4vDf2 sWzNwWrWrbTwHSBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QlB0TW4trPmI0VG40Uv5sEi2P2hMXNPHshtVYD1GmwY=; b=CQMn26sHNn7dAkSKDs/T0FxKCsawur0NVFaL1NunMVgYXlervlHuSqFAWt3LQMlncedAn3 k9b7d0CXI7C9nUfmchILBhQNgHciWgMsv60QPlUNLkyma6Ct8bak1f5IdU1zJk/AYCJQlB VWvEK0462xQmZN28WC73riquuQx8Tm+V6NhqKxkGJVvo90voYfZ0FTms0mtysOmdm9G+kG w9jgPIu/ELIXNA8v8xZeJip8HOF53pcxg+nsBCQadsFfMK4cnUY/PqIHd5s+FUQq5s7Tl0 uvbzSWbZUfrd6wDTevta2CiyYBMy8wn04fXcSWRjs6OlMkvSqwT6FOhA70J/Ig== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 30/54] samba: Remove un-exported password sync option Date: Tue, 13 Oct 2020 16:07:48 +0000 Message-Id: <20201013160812.27754-30-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 5d0d95b38..b8ea18857 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -68,7 +68,6 @@ $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'user'; $sambasettings{'REMOTEANNOUNCE'} = ''; $sambasettings{'REMOTESYNC'} = ''; -$sambasettings{'PASSWORDSYNC'} = 'off'; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Bad User'; $sambasettings{'WIDELINKS'} = 'on'; @@ -123,7 +122,6 @@ if ($sambasettings{'ACTION'} eq $Lang::tr{'save'}) delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'}; &General::writehash("${General::swroot}/samba/settings", \%sambasettings); -if ($sambasettings{'PASSWORDSYNC'} eq 'on'){ $sambasettings{'PASSWORDSYNC'} = "true";} else { $sambasettings{'PASSWORDSYNC'} = "false";} if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} = "yes";} else { $sambasettings{'WIDELINKS'} = "no";} if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'} = "yes";} else { $sambasettings{'UNIXEXTENSION'} = "no";} @@ -150,7 +148,7 @@ map to guest = $sambasettings{'MAPTOGUEST'} security = $sambasettings{'SECURITY'} guest account = $sambasettings{'GUESTACCOUNT'} -unix password sync = $sambasettings{'PASSWORDSYNC'} +unix password sync = no bind interfaces only = true interfaces = green0 blue0 127.0.0.0/8 @@ -208,9 +206,6 @@ if ($message) { ############################################################################################################################ ########################################## Aktivieren von Checkboxen und Dropdowns ######################################### -$checked{'PASSWORDSYNC'}{'off'} = ''; -$checked{'PASSWORDSYNC'}{'on'} = ''; -$checked{'PASSWORDSYNC'}{$sambasettings{'PASSWORDSYNC'}} = "checked='checked'"; $checked{'WIDELINKS'}{'off'} = ''; $checked{'WIDELINKS'}{'on'} = ''; $checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} = "checked='checked'"; @@ -284,11 +279,6 @@ print <Bad User -END -; -#$Lang::tr{'unix password sync'}on / -# off -print <
$Lang::tr{'network options'} $Lang::tr{'remote announce'} From patchwork Tue Oct 13 16:07:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3556 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTk6Qw1z3x3M for ; Tue, 13 Oct 2020 16:09:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSw4pczz1R6; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSt1Jx9z3059; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSr1C4xz2xb4 for ; Tue, 13 Oct 2020 16:08:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSp1j7Tz1Hv; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2y9689wp7K+SshQ8FlRRMlRWf3co8aHapDbZoLMD8Ac=; b=DLJPNOwWxmMq4nzCdP9jPR77wWQiFz4VE/3bhp+XKnalUuGAsOD7xv3hJWnaDfqZs9H6+A 686i17pGVfsj2EDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2y9689wp7K+SshQ8FlRRMlRWf3co8aHapDbZoLMD8Ac=; b=NzSubkr4qgcthG+oxlTqtqRxRyPRtICtDYeg4ssntuPpnKbm0yCT+dBw1qcFNNDS8MCO8Z lC+DT99DuhC9p1l4HQKeEXNKI7q+nph9GLVlg75SZkmW7Mud8wg+icZN/8LrtkNTtg91Tq dAHcO9anbgwbZk/+8Ybd6ysw3n2Mfu4CCL8ySytCO+PomS6YM0Au8gmsgrp0sR+nJNW0fp 7dlW+9s4/Y/yWlcMexH5wUvdkdP3uRpI0nS5wxzP5dARuK+mq4S+Sr7QaFlNiRKz0kY7Zg UgvfEQ4ozZCJYTleaflg75cQI/rgJfT/374q5BX4NnDfA+ZqO8o3KmGt5yjJ3w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 31/54] samba: Refactor service status Date: Tue, 13 Oct 2020 16:07:49 +0000 Message-Id: <20201013160812.27754-31-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" No functional changes Signed-off-by: Michael Tremer --- doc/language_issues.de | 15 +++++++++++++++ doc/language_issues.en | 15 ++++----------- doc/language_issues.es | 15 +++++++++++++++ doc/language_issues.fr | 15 +++++++++++++++ doc/language_issues.it | 15 +++++++++++++++ doc/language_issues.nl | 15 +++++++++++++++ doc/language_issues.pl | 15 +++++++++++++++ doc/language_issues.ru | 15 +++++++++++++++ doc/language_issues.tr | 15 +++++++++++++++ doc/language_missings | 24 ++++++++++++++++++++++++ html/cgi-bin/samba.cgi | 40 +++++++++++++++++++++++----------------- langs/en/cgi-bin/en.pl | 3 +++ 12 files changed, 174 insertions(+), 28 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index e21a5fd31..32bdc1f5d 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -35,6 +35,8 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose 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: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -228,6 +230,7 @@ WARNING: translation string unused: dns server WARNING: translation string unused: dns servers WARNING: translation string unused: dnssec information WARNING: translation string unused: do not log this port list +WARNING: translation string unused: domain master WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: dos charset @@ -379,6 +382,7 @@ WARNING: translation string unused: insert floppy WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates +WARNING: translation string unused: interfaces WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: intrusion prevention system @@ -414,6 +418,7 @@ WARNING: translation string unused: line WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk +WARNING: translation string unused: local master WARNING: translation string unused: localkey WARNING: translation string unused: localkeyfile WARNING: translation string unused: locationblock country code @@ -469,6 +474,7 @@ WARNING: translation string unused: monthly traffic bad WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short +WARNING: translation string unused: more WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS WARNING: translation string unused: my new share @@ -513,6 +519,7 @@ WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original +WARNING: translation string unused: os level WARNING: translation string unused: other WARNING: translation string unused: our donors WARNING: translation string unused: out @@ -575,6 +582,8 @@ WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory +WARNING: translation string unused: pc +WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -583,6 +592,7 @@ WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe +WARNING: translation string unused: prefered master WARNING: translation string unused: present WARNING: translation string unused: printcap name WARNING: translation string unused: printer @@ -737,6 +747,7 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix password sync WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -841,6 +852,7 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string +WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: optional = Optional WARNING: untranslated string: pakfire invalid tree = Invalid repository selected @@ -849,3 +861,6 @@ 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: show tls-auth key = Show tls-auth key +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.en b/doc/language_issues.en index 07e6b2873..9a8a0f7bc 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -93,8 +93,6 @@ WARNING: untranslated string: a connection with this common name already exists WARNING: untranslated string: a connection with this name already exists = A connection with this name already exists. WARNING: untranslated string: abort = abort WARNING: untranslated string: accounting = Accounting -WARNING: untranslated string: accounting user nonpdc = Accounting - none PDC Mode -WARNING: untranslated string: accounting user pdc = Accounting - PDC Mode WARNING: untranslated string: acpitemp = ACPI - Temperatures WARNING: untranslated string: action = Action WARNING: untranslated string: activate = Activate @@ -641,7 +639,6 @@ WARNING: untranslated string: dod for dns = Dial on Demand for DNS: WARNING: untranslated string: dod not compatible with ddns = Dial on demand is not compatible with dynamic dns services WARNING: untranslated string: dod waiting = Dial on Demand waiting WARNING: untranslated string: domain = Domain -WARNING: untranslated string: domain master = Domain Master WARNING: untranslated string: domain name = Domain name WARNING: untranslated string: domain name suffix = Domain name suffix: WARNING: untranslated string: donation = Donation @@ -1066,7 +1063,6 @@ WARNING: untranslated string: instant update = Instant Update WARNING: untranslated string: integrity = Integrity: WARNING: untranslated string: interface = Interface WARNING: untranslated string: interface mode = Interface -WARNING: untranslated string: interfaces = Interfaces WARNING: untranslated string: internet = INTERNET WARNING: untranslated string: intrusion detection = Intrusion Prevention WARNING: untranslated string: intrusion detection system = Intrusion Prevention System @@ -1174,7 +1170,6 @@ WARNING: untranslated string: legend = Legend WARNING: untranslated string: lifetime = Lifetime: WARNING: untranslated string: linkq = Link Quality WARNING: untranslated string: local ip address = Local IP Address -WARNING: untranslated string: local master = Local Master WARNING: untranslated string: local ntp server specified but not enabled = Local NTP server specified but not enabled WARNING: untranslated string: local subnet = Local subnet: WARNING: untranslated string: local subnet is invalid = Local subnet is invalid. @@ -1286,7 +1281,6 @@ WARNING: untranslated string: monday = Monday WARNING: untranslated string: monitor interface = Monitor Interface WARNING: untranslated string: month = Month WARNING: untranslated string: months = Months -WARNING: untranslated string: more = more WARNING: untranslated string: most preferred = most preferred WARNING: untranslated string: mounted on = Mounted on WARNING: untranslated string: mpfire = Media Player for IPFire @@ -1305,6 +1299,7 @@ WARNING: untranslated string: nameserver = Nameserver WARNING: untranslated string: needreboot = An update requires a restart WARNING: untranslated string: net config = Network configuration WARNING: untranslated string: net to net vpn = Net-to-Net Virtual Private Network +WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: netmask = Netmask WARNING: untranslated string: network = Network WARNING: untranslated string: network internal = Network (internal) @@ -1379,7 +1374,6 @@ WARNING: untranslated string: orange = ORANGE WARNING: untranslated string: organization cant be empty = Organization can't be empty. WARNING: untranslated string: organization name = Organization Name WARNING: untranslated string: organization too long = Organization is too long; it should not be longer than 60 characters. -WARNING: untranslated string: os level = OS Level WARNING: untranslated string: other countries = Other countries WARNING: untranslated string: other login script = Other login script WARNING: untranslated string: otherip = other IP @@ -1454,9 +1448,7 @@ WARNING: untranslated string: password = Password: WARNING: untranslated string: password not set = Password not set. WARNING: untranslated string: password too short = Password is too short. WARNING: untranslated string: passwords do not match = Passwords do not match. -WARNING: untranslated string: pc = Workstation WARNING: untranslated string: pc add = Add workstation -WARNING: untranslated string: pdc options = PDC options WARNING: untranslated string: percentage = Percentage WARNING: untranslated string: persistent = Persistent WARNING: untranslated string: pfs yes no = Perfect Forward Secrecy (PFS) @@ -1473,7 +1465,6 @@ WARNING: untranslated string: pptp peer = Peer WARNING: untranslated string: pptp route = PPTP Route WARNING: untranslated string: pptp settings = Additional PPTP settings: WARNING: untranslated string: pre-shared key is too short = Pre-shared key is too short. -WARNING: untranslated string: prefered master = Prefered Master WARNING: untranslated string: prev = previous WARNING: untranslated string: primary dns = Primary DNS: WARNING: untranslated string: primary ntp server = Primary NTP server @@ -1611,6 +1602,7 @@ WARNING: untranslated string: size = Size WARNING: untranslated string: smart information = S.M.A.R.T. information WARNING: untranslated string: smartwarn1 = Device: WARNING: untranslated string: smartwarn2 = reports S.M.A.R.T. error +WARNING: untranslated string: smb daemon = SMB Daemon WARNING: untranslated string: smbrestart = Restart samba WARNING: untranslated string: smbstart = Start samba WARNING: untranslated string: smbstop = Stop samba @@ -1771,7 +1763,6 @@ WARNING: untranslated string: unblock all = Unblock all WARNING: untranslated string: uncheck all = Uncheck all WARNING: untranslated string: uninstall = Uninstall WARNING: untranslated string: unix group = UNIX usergroup -WARNING: untranslated string: unix password sync = Unix Password Sync WARNING: untranslated string: unix shell = UNIX Shell WARNING: untranslated string: unknown = UNKNOWN WARNING: untranslated string: unlimited = Unlimited @@ -2054,6 +2045,7 @@ WARNING: untranslated string: used memory = Used Memory WARNING: untranslated string: used swap = Used Swap WARNING: untranslated string: user = User WARNING: untranslated string: user log = user log +WARNING: untranslated string: user management = unknown string WARNING: untranslated string: user proxy logs = user proxy log WARNING: untranslated string: username = Username: WARNING: untranslated string: username not set = Username not set. @@ -2110,6 +2102,7 @@ WARNING: untranslated string: website = Website WARNING: untranslated string: wednesday = Wednesday WARNING: untranslated string: week = Week WARNING: untranslated string: weeks = Weeks +WARNING: untranslated string: winbind daemon = Winbind Daemon WARNING: untranslated string: wireless = Wireless WARNING: untranslated string: wireless config added = Wireless config added WARNING: untranslated string: wireless config changed = Wireless config changed diff --git a/doc/language_issues.es b/doc/language_issues.es index 69cfa239a..a7414c5fd 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -14,6 +14,8 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose 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: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -216,6 +218,7 @@ WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: domain master WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -330,6 +333,7 @@ WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates +WARNING: translation string unused: interfaces WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size @@ -363,6 +367,7 @@ WARNING: translation string unused: line WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk +WARNING: translation string unused: local master WARNING: translation string unused: localkey WARNING: translation string unused: localkeyfile WARNING: translation string unused: locationblock country code @@ -418,6 +423,7 @@ WARNING: translation string unused: monthly traffic bad WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short +WARNING: translation string unused: more WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS WARNING: translation string unused: my new share @@ -459,6 +465,7 @@ WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original +WARNING: translation string unused: os level WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 @@ -499,6 +506,8 @@ WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory +WARNING: translation string unused: pc +WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -507,6 +516,7 @@ WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe +WARNING: translation string unused: prefered master WARNING: translation string unused: present WARNING: translation string unused: printcap name WARNING: translation string unused: printer @@ -660,6 +670,7 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix password sync WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -1231,6 +1242,7 @@ WARNING: untranslated string: monitor interface = Monitor Interface WARNING: untranslated string: most preferred = most preferred WARNING: untranslated string: mtu = MTU WARNING: untranslated string: nameserver = Nameserver +WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: no data = unknown string WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: none = none @@ -1316,6 +1328,7 @@ WARNING: untranslated string: sent = Sent WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running. WARNING: untranslated string: show dh = Show Diffie-Hellman parameters WARNING: untranslated string: show tls-auth key = Show tls-auth key +WARNING: untranslated string: smb daemon = SMB Daemon WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported @@ -1407,6 +1420,7 @@ WARNING: untranslated string: uplink bit rate = Uplink Bit Rate WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters WARNING: untranslated string: uptime load average = Load average WARNING: untranslated string: urlfilter redirect template = Redirect page template +WARNING: untranslated string: user management = unknown string WARNING: untranslated string: vendor = Vendor WARNING: untranslated string: visit us at = Visit us at WARNING: untranslated string: vpn broken = Broken @@ -1427,6 +1441,7 @@ WARNING: untranslated string: vpn wait = WAITING WARNING: untranslated string: vpn weak = Weak WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable +WARNING: untranslated string: winbind daemon = Winbind Daemon WARNING: untranslated string: wireless network = WiFi Network WARNING: untranslated string: wlan client = Wireless client WARNING: untranslated string: wlan client advanced settings = Advanced settings diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 4a90b851d..b6ab22001 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -39,6 +39,8 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose 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: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -255,6 +257,7 @@ WARNING: translation string unused: dns server WARNING: translation string unused: dns servers WARNING: translation string unused: dnssec information WARNING: translation string unused: do not log this port list +WARNING: translation string unused: domain master WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -408,6 +411,7 @@ WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates +WARNING: translation string unused: interfaces WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: intrusion prevention system @@ -443,6 +447,7 @@ WARNING: translation string unused: line WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk +WARNING: translation string unused: local master WARNING: translation string unused: localkey WARNING: translation string unused: localkeyfile WARNING: translation string unused: locationblock country code @@ -498,6 +503,7 @@ WARNING: translation string unused: monthly traffic bad WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short +WARNING: translation string unused: more WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS WARNING: translation string unused: my new share @@ -544,6 +550,7 @@ WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original +WARNING: translation string unused: os level WARNING: translation string unused: other WARNING: translation string unused: our donors WARNING: translation string unused: out @@ -606,6 +613,8 @@ WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory +WARNING: translation string unused: pc +WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -614,6 +623,7 @@ WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe +WARNING: translation string unused: prefered master WARNING: translation string unused: present WARNING: translation string unused: printcap name WARNING: translation string unused: printer @@ -775,6 +785,7 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix password sync WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -880,9 +891,13 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string +WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: optional = Optional WARNING: untranslated string: pakfire ago = ago. 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: 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 6a0fe8007..759c21777 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -15,6 +15,8 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose 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: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -230,6 +232,7 @@ WARNING: translation string unused: dns servers WARNING: translation string unused: dnsforward forward_server WARNING: translation string unused: dnssec information WARNING: translation string unused: do not log this port list +WARNING: translation string unused: domain master WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -387,6 +390,7 @@ WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates +WARNING: translation string unused: interfaces WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size @@ -421,6 +425,7 @@ WARNING: translation string unused: line WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk +WARNING: translation string unused: local master WARNING: translation string unused: localkey WARNING: translation string unused: localkeyfile WARNING: translation string unused: log enabled @@ -473,6 +478,7 @@ WARNING: translation string unused: monthly traffic bad WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short +WARNING: translation string unused: more WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS WARNING: translation string unused: my new share @@ -518,6 +524,7 @@ WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original +WARNING: translation string unused: os level WARNING: translation string unused: other WARNING: translation string unused: our donors WARNING: translation string unused: out @@ -580,6 +587,8 @@ WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory +WARNING: translation string unused: pc +WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -588,6 +597,7 @@ WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe +WARNING: translation string unused: prefered master WARNING: translation string unused: present WARNING: translation string unused: printcap name WARNING: translation string unused: printer @@ -750,6 +760,7 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix password sync WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -1046,6 +1057,7 @@ WARNING: untranslated string: meltdown = Meltdown WARNING: untranslated string: messages = Messages WARNING: untranslated string: mitigated = Mitigated WARNING: untranslated string: mtu = MTU +WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: no data = unknown string WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: none = none @@ -1089,6 +1101,7 @@ WARNING: untranslated string: samba join a domain = Join a domain WARNING: untranslated string: samba join domain = Join domain WARNING: untranslated string: search = Search WARNING: untranslated string: sent = Sent +WARNING: untranslated string: smb daemon = SMB Daemon WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported @@ -1119,6 +1132,7 @@ WARNING: untranslated string: uncheck all = Uncheck all WARNING: untranslated string: unlimited = Unlimited WARNING: untranslated string: update ruleset = Update ruleset WARNING: untranslated string: uplink bit rate = Uplink Bit Rate +WARNING: untranslated string: user management = unknown string WARNING: untranslated string: vpn broken = Broken WARNING: untranslated string: vpn connecting = CONNECTING WARNING: untranslated string: vpn force mobike = Force using MOBIKE (only IKEv2) @@ -1136,6 +1150,7 @@ WARNING: untranslated string: vpn wait = WAITING WARNING: untranslated string: vpn weak = Weak WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable +WARNING: untranslated string: winbind daemon = Winbind Daemon WARNING: untranslated string: wireless network = WiFi Network WARNING: untranslated string: wlan client anonymous identity = Anonymous Identity WARNING: untranslated string: wlan client auth auto = Auto diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 2193d875a..29e714dcd 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -15,6 +15,8 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose 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: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -226,6 +228,7 @@ WARNING: translation string unused: dns saved txt WARNING: translation string unused: dns server WARNING: translation string unused: dnsforward forward_server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: domain master WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -383,6 +386,7 @@ WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates +WARNING: translation string unused: interfaces WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size @@ -417,6 +421,7 @@ WARNING: translation string unused: line WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk +WARNING: translation string unused: local master WARNING: translation string unused: localkey WARNING: translation string unused: localkeyfile WARNING: translation string unused: log enabled @@ -469,6 +474,7 @@ WARNING: translation string unused: monthly traffic bad WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short +WARNING: translation string unused: more WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS WARNING: translation string unused: my new share @@ -513,6 +519,7 @@ WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original +WARNING: translation string unused: os level WARNING: translation string unused: other WARNING: translation string unused: our donors WARNING: translation string unused: out @@ -573,6 +580,8 @@ WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory +WARNING: translation string unused: pc +WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -581,6 +590,7 @@ WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe +WARNING: translation string unused: prefered master WARNING: translation string unused: present WARNING: translation string unused: printcap name WARNING: translation string unused: printer @@ -742,6 +752,7 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix password sync WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -1070,6 +1081,7 @@ WARNING: untranslated string: modem status = Modem Status WARNING: untranslated string: monitor interface = Monitor Interface WARNING: untranslated string: mtu = MTU WARNING: untranslated string: nameserver = Nameserver +WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: no data = unknown string WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: none = none @@ -1124,6 +1136,7 @@ WARNING: untranslated string: search = Search WARNING: untranslated string: sent = Sent WARNING: untranslated string: show dh = Show Diffie-Hellman parameters WARNING: untranslated string: show tls-auth key = Show tls-auth key +WARNING: untranslated string: smb daemon = SMB Daemon WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported @@ -1158,6 +1171,7 @@ WARNING: untranslated string: unlimited = Unlimited WARNING: untranslated string: update ruleset = Update ruleset WARNING: untranslated string: uplink bit rate = Uplink Bit Rate WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters +WARNING: untranslated string: user management = unknown string WARNING: untranslated string: vendor = Vendor WARNING: untranslated string: vpn broken = Broken WARNING: untranslated string: vpn connecting = CONNECTING @@ -1176,6 +1190,7 @@ WARNING: untranslated string: vpn wait = WAITING WARNING: untranslated string: vpn weak = Weak WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable +WARNING: untranslated string: winbind daemon = Winbind Daemon WARNING: untranslated string: wireless network = WiFi Network WARNING: untranslated string: wlan client anonymous identity = Anonymous Identity WARNING: untranslated string: wlan client auth auto = Auto diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 69cfa239a..a7414c5fd 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -14,6 +14,8 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose 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: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -216,6 +218,7 @@ WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: domain master WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -330,6 +333,7 @@ WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates +WARNING: translation string unused: interfaces WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size @@ -363,6 +367,7 @@ WARNING: translation string unused: line WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk +WARNING: translation string unused: local master WARNING: translation string unused: localkey WARNING: translation string unused: localkeyfile WARNING: translation string unused: locationblock country code @@ -418,6 +423,7 @@ WARNING: translation string unused: monthly traffic bad WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short +WARNING: translation string unused: more WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS WARNING: translation string unused: my new share @@ -459,6 +465,7 @@ WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original +WARNING: translation string unused: os level WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall mode0 @@ -499,6 +506,8 @@ WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory +WARNING: translation string unused: pc +WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -507,6 +516,7 @@ WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe +WARNING: translation string unused: prefered master WARNING: translation string unused: present WARNING: translation string unused: printcap name WARNING: translation string unused: printer @@ -660,6 +670,7 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix password sync WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -1231,6 +1242,7 @@ WARNING: untranslated string: monitor interface = Monitor Interface WARNING: untranslated string: most preferred = most preferred WARNING: untranslated string: mtu = MTU WARNING: untranslated string: nameserver = Nameserver +WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: no data = unknown string WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: none = none @@ -1316,6 +1328,7 @@ WARNING: untranslated string: sent = Sent WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running. WARNING: untranslated string: show dh = Show Diffie-Hellman parameters WARNING: untranslated string: show tls-auth key = Show tls-auth key +WARNING: untranslated string: smb daemon = SMB Daemon WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported @@ -1407,6 +1420,7 @@ WARNING: untranslated string: uplink bit rate = Uplink Bit Rate WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters WARNING: untranslated string: uptime load average = Load average WARNING: untranslated string: urlfilter redirect template = Redirect page template +WARNING: untranslated string: user management = unknown string WARNING: untranslated string: vendor = Vendor WARNING: untranslated string: visit us at = Visit us at WARNING: untranslated string: vpn broken = Broken @@ -1427,6 +1441,7 @@ WARNING: untranslated string: vpn wait = WAITING WARNING: untranslated string: vpn weak = Weak WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable +WARNING: untranslated string: winbind daemon = Winbind Daemon WARNING: untranslated string: wireless network = WiFi Network WARNING: untranslated string: wlan client = Wireless client WARNING: untranslated string: wlan client advanced settings = Advanced settings diff --git a/doc/language_issues.ru b/doc/language_issues.ru index e9b6fd9b9..380f46043 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -15,6 +15,8 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose 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: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -216,6 +218,7 @@ WARNING: translation string unused: dns saved WARNING: translation string unused: dns saved txt WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: domain master WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -326,6 +329,7 @@ WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates +WARNING: translation string unused: interfaces WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size @@ -359,6 +363,7 @@ WARNING: translation string unused: line WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk +WARNING: translation string unused: local master WARNING: translation string unused: localkey WARNING: translation string unused: localkeyfile WARNING: translation string unused: log enabled @@ -410,6 +415,7 @@ WARNING: translation string unused: monthly traffic bad WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short +WARNING: translation string unused: more WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS WARNING: translation string unused: my new share @@ -451,6 +457,7 @@ WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original +WARNING: translation string unused: os level WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall WARNING: translation string unused: outgoing firewall add ip group @@ -502,6 +509,8 @@ WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory +WARNING: translation string unused: pc +WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -510,6 +519,7 @@ WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe +WARNING: translation string unused: prefered master WARNING: translation string unused: present WARNING: translation string unused: printcap name WARNING: translation string unused: printer @@ -663,6 +673,7 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix password sync WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -1233,6 +1244,7 @@ WARNING: untranslated string: monitor interface = Monitor Interface WARNING: untranslated string: most preferred = most preferred WARNING: untranslated string: mtu = MTU WARNING: untranslated string: nameserver = Nameserver +WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: no data = unknown string WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: none = none @@ -1312,6 +1324,7 @@ WARNING: untranslated string: sent = Sent WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running. WARNING: untranslated string: show dh = Show Diffie-Hellman parameters WARNING: untranslated string: show tls-auth key = Show tls-auth key +WARNING: untranslated string: smb daemon = SMB Daemon WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported @@ -1402,6 +1415,7 @@ WARNING: untranslated string: uplink bit rate = Uplink Bit Rate WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters WARNING: untranslated string: uptime load average = Load average WARNING: untranslated string: urlfilter redirect template = Redirect page template +WARNING: untranslated string: user management = unknown string WARNING: untranslated string: vendor = Vendor WARNING: untranslated string: visit us at = Visit us at WARNING: untranslated string: vpn broken = Broken @@ -1422,6 +1436,7 @@ WARNING: untranslated string: vpn wait = WAITING WARNING: untranslated string: vpn weak = Weak WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable +WARNING: untranslated string: winbind daemon = Winbind Daemon WARNING: untranslated string: wireless network = WiFi Network WARNING: untranslated string: wlan client = Wireless client WARNING: untranslated string: wlan client advanced settings = Advanced settings diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 047850ef2..62567ffc5 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -36,6 +36,8 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose 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: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -252,6 +254,7 @@ WARNING: translation string unused: dns servers WARNING: translation string unused: dnsforward forward_server WARNING: translation string unused: dnssec information WARNING: translation string unused: do not log this port list +WARNING: translation string unused: domain master WARNING: translation string unused: domain not set WARNING: translation string unused: donation-link WARNING: translation string unused: done @@ -412,6 +415,7 @@ WARNING: translation string unused: insert removable device WARNING: translation string unused: install new update WARNING: translation string unused: installed WARNING: translation string unused: installed updates +WARNING: translation string unused: interfaces WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: intrusion detection system2 WARNING: translation string unused: invalid cache size @@ -446,6 +450,7 @@ WARNING: translation string unused: line WARNING: translation string unused: load printer WARNING: translation string unused: loaded modules WARNING: translation string unused: local hard disk +WARNING: translation string unused: local master WARNING: translation string unused: localkey WARNING: translation string unused: localkeyfile WARNING: translation string unused: locationblock country code @@ -501,6 +506,7 @@ WARNING: translation string unused: monthly traffic bad WARNING: translation string unused: monthly volume WARNING: translation string unused: monthly volume start day WARNING: translation string unused: monthly volume start day short +WARNING: translation string unused: more WARNING: translation string unused: mount WARNING: translation string unused: mtu QoS WARNING: translation string unused: my new share @@ -546,6 +552,7 @@ WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original +WARNING: translation string unused: os level WARNING: translation string unused: other WARNING: translation string unused: our donors WARNING: translation string unused: out @@ -608,6 +615,8 @@ WARNING: translation string unused: password contains illegal characters WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory +WARNING: translation string unused: pc +WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry WARNING: translation string unused: ping disabled @@ -616,6 +625,7 @@ WARNING: translation string unused: port forwarding configuration WARNING: translation string unused: ports WARNING: translation string unused: pots WARNING: translation string unused: pppoe +WARNING: translation string unused: prefered master WARNING: translation string unused: present WARNING: translation string unused: printcap name WARNING: translation string unused: printer @@ -778,6 +788,7 @@ WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug WARNING: translation string unused: unencrypted WARNING: translation string unused: unix charset +WARNING: translation string unused: unix password sync WARNING: translation string unused: update transcript WARNING: translation string unused: updatedatabase WARNING: translation string unused: updates @@ -964,6 +975,7 @@ WARNING: untranslated string: local ip address = Local IP Address WARNING: untranslated string: meltdown = Meltdown WARNING: untranslated string: mitigated = Mitigated WARNING: untranslated string: mtu = MTU +WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: no data = unknown string WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: not affected = Not Affected @@ -991,6 +1003,7 @@ 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: sent = Sent +WARNING: untranslated string: smb daemon = SMB Daemon WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported @@ -1010,12 +1023,14 @@ WARNING: untranslated string: system is offline = The system is offline. WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2 WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: update ruleset = Update ruleset +WARNING: untranslated string: user management = unknown string WARNING: untranslated string: vpn start action add = Wait for connection initiation WARNING: untranslated string: vpn statistics n2n = unknown string WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy. WARNING: untranslated string: vpn wait = WAITING WARNING: untranslated string: vulnerability = Vulnerability WARNING: untranslated string: vulnerable = Vulnerable +WARNING: untranslated string: winbind daemon = Winbind Daemon WARNING: untranslated string: wlanap auto = Automatic Channel Selection WARNING: untranslated string: wlanap broadcast ssid = Broadcast SSID WARNING: untranslated string: wlanap client isolation = Client Isolation diff --git a/doc/language_missings b/doc/language_missings index 253e87b33..6908166d9 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -37,6 +37,7 @@ < g.dtm < g.lite < insert removable device +< netbios nameserver daemon < no entries < notes < okay @@ -47,12 +48,14 @@ < show areas < show lines < show tls-auth key +< smb daemon < teovpn_fragment < tor bridge enabled < tor errmsg invalid node id < updxlrtr used by < upload fcdsl.o < vpn configuration main +< winbind daemon ############################################################################ # Checking cgi-bin translations for language: es # ############################################################################ @@ -617,6 +620,7 @@ < mtu < MTU settings < nameserver +< netbios nameserver daemon < never < no entries < no hardware random number generator @@ -727,6 +731,7 @@ < Set time on boot < show dh < show tls-auth key +< smb daemon < smt disabled < smt enabled < smt not supported @@ -851,6 +856,7 @@ < vulnerability < vulnerable < Weekly +< winbind daemon < wireless network < wlanap < wlanap auto @@ -931,9 +937,12 @@ < desired < g.dtm < g.lite +< netbios nameserver daemon < optional < required +< smb daemon < upload fcdsl.o +< winbind daemon ############################################################################ # Checking cgi-bin translations for language: it # ############################################################################ @@ -1165,6 +1174,7 @@ < mitigated < mtu < MTU settings +< netbios nameserver daemon < no entries < none < not affected @@ -1206,6 +1216,7 @@ < samba join domain < search < sent +< smb daemon < smt disabled < smt enabled < smt not supported @@ -1253,6 +1264,7 @@ < vulnerability < vulnerable < Weekly +< winbind daemon < wireless network < wlanap < wlanap auto @@ -1560,6 +1572,7 @@ < mtu < MTU settings < nameserver +< netbios nameserver daemon < never < no entries < none @@ -1615,6 +1628,7 @@ < sent < show dh < show tls-auth key +< smb daemon < smt disabled < smt enabled < smt not supported @@ -1668,6 +1682,7 @@ < vulnerability < vulnerable < Weekly +< winbind daemon < wireless network < wlanap < wlanap auto @@ -2273,6 +2288,7 @@ < mtu < MTU settings < nameserver +< netbios nameserver daemon < never < no entries < no hardware random number generator @@ -2368,6 +2384,7 @@ < server restart < show dh < show tls-auth key +< smb daemon < smt disabled < smt enabled < smt not supported @@ -2491,6 +2508,7 @@ < vulnerability < vulnerable < Weekly +< winbind daemon < wireless network < wlanap < wlanap auto @@ -3136,6 +3154,7 @@ < mtu < MTU settings < nameserver +< netbios nameserver daemon < never < no entries < no hardware random number generator @@ -3228,6 +3247,7 @@ < server restart < show dh < show tls-auth key +< smb daemon < smt disabled < smt enabled < smt not supported @@ -3352,6 +3372,7 @@ < vulnerable < week-graph < Weekly +< winbind daemon < wireless network < wlanap < wlanap auto @@ -3517,6 +3538,7 @@ < meltdown < mitigated < mtu +< netbios nameserver daemon < no entries < not affected < not validating @@ -3541,6 +3563,7 @@ < required < runmode < sent +< smb daemon < smt disabled < smt enabled < smt not supported @@ -3566,6 +3589,7 @@ < vulnerability < vulnerable < Weekly +< winbind daemon < wlanap auto < wlanap broadcast ssid < wlanap client isolation diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index b8ea18857..029cc2691 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -56,8 +56,6 @@ my %shares = (); ############################################################################################################################ ############################################# Samba Dienste fr Statusberprfung ########################################## -my %servicenames = ('SMB Daemon' => 'smbd', 'NetBIOS Nameserver' => 'nmbd', 'Winbind Daemon' => 'winbindd'); - &Header::showhttpheaders(); ############################################################################################################################ @@ -227,25 +225,33 @@ $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'"; ################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ################################### &Header::openbox('100%', 'center', $Lang::tr{'samba'}); -print < - - -
$Lang::tr{'all services'}
+ +my %servicenames = ( + "nmbd" => $Lang::tr{'netbios nameserver daemon'}, + "smbd" => $Lang::tr{'smb daemon'}, + "winbindd" => $Lang::tr{'winbind daemon'}, +); + +print < + + + END -; -my $key = ''; -foreach $key (sort keys %servicenames) - { - print ""; - my $shortname = $servicenames{$key}; - my $status = &isrunning($shortname); - print "$status"; - } +foreach my $service (sort keys %servicenames) { + my $status = &isrunning($service); + + print < + + $status + +END +} print < +
$Lang::tr{'all services'}
$key
$servicenames{$service}

-
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d076e184f..b907eb325 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1782,6 +1782,7 @@ 'net traffic newversion' => 'New Net-Traffic version is available:', 'net-traffic configuration' => 'Net-Traffic Configuration', 'netbios name' => 'Netbios Name', +'netbios nameserver daemon' => 'NetBIOS Nameserver Daemon', 'netmask' => 'Netmask', 'network' => 'Network', 'network added' => 'Custom network added', @@ -2255,6 +2256,7 @@ 'smart information' => 'S.M.A.R.T. information', 'smartwarn1' => 'Device:', 'smartwarn2' => 'reports S.M.A.R.T. error', +'smb daemon' => 'SMB Daemon', 'smbreload' => 'Reload samba', 'smbrestart' => 'Restart samba', 'smbstart' => 'Start samba', @@ -2901,6 +2903,7 @@ 'weekly firewallhits' => 'weekly firewallhits', 'weeks' => 'Weeks', 'wildcards' => 'Wildcards', +'winbind daemon' => 'Winbind Daemon', 'wins server' => 'Wins Server', 'wins support' => 'Wins Support', 'wireless' => 'Wireless', From patchwork Tue Oct 13 16:07:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3557 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTm3Cllz3x1S for ; Tue, 13 Oct 2020 16:09:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSw4rfMz1RT; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSt1z5Tz304c; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSr1dMsz303l for ; Tue, 13 Oct 2020 16:08:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSp44rNz1Gb; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qqEzO9LkbkUS3rg8462fwBI6Q58Jay2X7IKATHrOm2E=; b=85Wt+r5TKADlZ+TWRu0IdnJnMV51+eMfezb5fpHPcFV9HZpF6/Vc+CuDenfbg40Uf3yey2 Bp44+Qz0XObPW2Dw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qqEzO9LkbkUS3rg8462fwBI6Q58Jay2X7IKATHrOm2E=; b=v6SMAP9QANXRUP3GtrQz2sRs6UkbkQeFTCQ+mJ5pyQ4wmsvhFDMjx788pAhW0ZIDqAV1/s LtnI+Ubw+aFVvKofTcnk2aI7mUxWdV0Fm/faTlua7ItWeNN7bB03+3hCADFO/PvYLVIQWK Fj8mQwCJf+M/V721Md5sg678Ixb7+Uaqqm+/xcoc246R5uq6iBxwarnYVShYwjbIlXMegj 4hK79ELNmp2o2xYRuUoUs5BLsKFSFAEtFQ0KHuoiACRDnIEOh+Wh6lZ0BtodZxfyPmtrPr zOacQ+zN8YUgR3eOFaKpmXqfeE2ua+GrloDBaHX0LuYrjPh0QUAEAM87CfeIRQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 32/54] samba: Drop refresh page hack Date: Tue, 13 Oct 2020 16:07:50 +0000 Message-Id: <20201013160812.27754-32-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is very invalid HTML, very often inserted into spaces where it should not be, and the page does not even need to be reloaded after any action has been performed. Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 029cc2691..1619045cc 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -80,8 +80,6 @@ my $LOGLINES = '50'; &General::readhash("${General::swroot}/samba/settings", \%sambasettings); &Header::getcgihash(\%sambasettings); -sub refreshpage{&Header::openbox( 'Waiting', 1, "" );print "

$Lang::tr{'pagerefresh'}
";&Header::closebox();} - if (($sambasettings{'WIDELINKS'} eq 'on') & ($sambasettings{'UNIXEXTENSION'} eq 'on')) {$errormessage = "$errormessage
Don't enable 'Wide links' and 'Unix extension' at the same time"; } @@ -91,15 +89,15 @@ if (($sambasettings{'WIDELINKS'} eq 'on') & ($sambasettings{'UNIXEXTENSION'} eq ############################################################################################################################ ############################################# Samba Rootskript aufrufe fr SU-Actions ####################################### -if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system("/usr/local/bin/sambactrl smbuserdisable $sambasettings{'NAME'}");refreshpage();} -if ($sambasettings{'ACTION'} eq 'smbuserenable'){system("/usr/local/bin/sambactrl smbuserenable $sambasettings{'NAME'}");refreshpage();} -if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");refreshpage();} -if ($sambasettings{'ACTION'} eq 'smbpcadd'){system("/usr/local/bin/sambactrl smbpcadd $sambasettings{'PCNAME'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");refreshpage();} -if ($sambasettings{'ACTION'} eq 'smbchangepw'){system("/usr/local/bin/sambactrl smbchangepw $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");refreshpage();} -if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl smbrestart");refreshpage();} -if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");refreshpage();} -if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");refreshpage();} -if ($sambasettings{'ACTION'} eq 'smbreload'){system("/usr/local/bin/sambactrl smbreload");refreshpage();} +if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system("/usr/local/bin/sambactrl smbuserdisable $sambasettings{'NAME'}");} +if ($sambasettings{'ACTION'} eq 'smbuserenable'){system("/usr/local/bin/sambactrl smbuserenable $sambasettings{'NAME'}");} +if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");} +if ($sambasettings{'ACTION'} eq 'smbpcadd'){system("/usr/local/bin/sambactrl smbpcadd $sambasettings{'PCNAME'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");} +if ($sambasettings{'ACTION'} eq 'smbchangepw'){system("/usr/local/bin/sambactrl smbchangepw $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");} +if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl smbrestart");} +if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");} +if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");} +if ($sambasettings{'ACTION'} eq 'smbreload'){system("/usr/local/bin/sambactrl smbreload");} if ($sambasettings{'ACTION'} eq 'join') { $message .= &joindomain($sambasettings{'USERNAME'}, $sambasettings{'PASSWORD'}); } @@ -107,7 +105,7 @@ if ($sambasettings{'ACTION'} eq 'join') { ############################################################################################################################ ########################################### Samba Benutzer oder PC l�chen ################################################# -if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");refreshpage();} +if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");} ############################################################################################################################ ##################################### Umsetzen der Werte von Checkboxen und Dropdowns ###################################### @@ -179,7 +177,6 @@ close FILE; system("/usr/local/bin/sambactrl smbsafeconf"); system("/usr/local/bin/sambactrl smbreload"); -refreshpage(); } &General::readhash("${General::swroot}/samba/settings", \%sambasettings); @@ -772,7 +769,6 @@ close FILE; system("/usr/local/bin/sambactrl smbsafeconf"); system("/usr/local/bin/sambactrl smbreload"); -refreshpage(); } sub isrunning From patchwork Tue Oct 13 16:07:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3560 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTv69Pkz3x1S for ; Tue, 13 Oct 2020 16:09:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSx65Mrz18q; Tue, 13 Oct 2020 16:08:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSt2drRz305L; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSr20fNz304k for ; Tue, 13 Oct 2020 16:08:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSp51tMz12S; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=opyMoeWvnWfOrGmeULV4qZxtutZC0+pbl49nq+eOGCo=; b=CU9h5s6qtXSiZXUjjHxUmoR9LxZMD1em1bgK5XXEXXzCl605Shd1LgilgohAuJPyBm2Nko DxXuXGvXzmZ2ChCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=opyMoeWvnWfOrGmeULV4qZxtutZC0+pbl49nq+eOGCo=; b=jA1OZO2xN8fuPfcI1h2seAykI7GyFb08Vf5TmixIskhMvGhZ7gijQuI/VL0tgMVUAhhdcN eL0isJHHbSMVb3N2ebgg0eAwgzTCt3ByuNfdZysWPkUFevj1YhFTaOLT8KYargN2GAHdqj N/n+YyrANObubaDlWqvHj1OWRBUU8WWv92oXl0oJDwekBnj4FcK/Sx20iRjK9G5IRfTBAv 9k4yRS84eH5SWvZ3mkRRn29U49m7JPQTo5Tg1OxCnhpKxVy/9jJIvDlSZW4yvd0wAK/URx BnuVkgOCqnj96E3kH4JnNLWn3FH1AAEyAWUkhVUrbijn0MkR9uI3Zjs56v2pCQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 33/54] samba: Add tbl class to all s Date: Tue, 13 Oct 2020 16:07:51 +0000 Message-Id: <20201013160812.27754-33-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 1619045cc..73f2c4d39 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -230,7 +230,7 @@ my %servicenames = ( ); print < +
@@ -250,7 +250,7 @@ END print <
-
$Lang::tr{'all services'}
+
@@ -258,7 +258,7 @@ print <
-
+
@@ -323,7 +323,7 @@ if ($sambasettings{'SECURITY'} eq 'user') print <
-
$Lang::tr{'basic options'}
$Lang::tr{'workgroup'}

+
@@ -522,7 +522,7 @@ if ($sambasettings{'SECURITY'} eq "ADS") { -
$Lang::tr{'accounting'}
$Lang::tr{'username'}$Lang::tr{'password'}
+
-END -; - - print <
- - - +
@@ -573,7 +573,7 @@ my %shares = config("${General::swroot}/samba/shares"); print <
- +
END @@ -707,7 +707,7 @@ if ($sambasettings{'ACTION'} eq 'smbsharechange') print < -
$Lang::tr{'manage shares'}
$Lang::tr{'sharename'}$Lang::tr{'options'}
+
$Lang::tr{'samba status'}
$Status
From patchwork Tue Oct 13 16:07:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3559 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTt4150z3x1S for ; Tue, 13 Oct 2020 16:09:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSx6jt4z1S3; Tue, 13 Oct 2020 16:08:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSt3GvZz304y; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSs0fCcz2xBM for ; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSp6n8Wz1Gp; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2ZNOkv4TiV6JicfuzrSrfMv5tYk2UmtOkLYIegcxpP0=; b=vIxK421E5oIx+Lv9IBhbj28c2erMC/+ZnJZXsz4BcOSEbpMV2PaMDvGexKL9YctfsnaH2F TdG81kLsP+wTe0Bw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2ZNOkv4TiV6JicfuzrSrfMv5tYk2UmtOkLYIegcxpP0=; b=EEzcHElwGg6MwaNNY8WTLkQSzI0Bt01z8Zr1MginkZBM6C6E8XpkcWZ2fXV2oB69FP8kqb jdJhMhw6g3I8mdQYJ4F4qb9tARWs++yIVPAjELu4Sg6l5WscMZjplVCfY6+dOCMoxHXelf MIo8byKfH6oDCMY17YEt61E/0qi35M++mOXtqHamDOIOUQYlyUjub0TuKbyMMacLnTY+Qn Me7b7hN+cXFX+foSbHcWIlQSHZwy1qKaa+zBbgRFID9J7Rwn0HOL45tsbSSfdLS6+Pl9+w CF0L3eM02fWvcEF/tYcWWDh0dSJWX7baFFd/ASZrkCD6VpjWtQVbDjfiwHKjWg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 34/54] samba: Replace icons on top of page with buttons Date: Tue, 13 Oct 2020 16:07:52 +0000 Message-Id: <20201013160812.27754-34-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- doc/language_issues.de | 5 +++++ doc/language_issues.en | 5 ++--- doc/language_issues.es | 5 +++++ doc/language_issues.fr | 5 +++++ doc/language_issues.it | 5 +++++ doc/language_issues.nl | 5 +++++ doc/language_issues.pl | 5 +++++ doc/language_issues.ru | 5 +++++ doc/language_issues.tr | 5 +++++ doc/language_missings | 16 ++++++++++++++++ html/cgi-bin/samba.cgi | 36 ++++++++++++++++++++++++++++-------- langs/en/cgi-bin/en.pl | 2 ++ 12 files changed, 88 insertions(+), 11 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 32bdc1f5d..853e1ae9d 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -658,6 +658,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: socket options @@ -820,6 +823,8 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val zoneslave amount error WARNING: untranslated string: desired = Desired +WARNING: untranslated string: disable = Disable +WARNING: untranslated string: enable = Enable WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string diff --git a/doc/language_issues.en b/doc/language_issues.en index 9a8a0f7bc..6e61d0475 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -594,6 +594,7 @@ WARNING: untranslated string: dial = Connect WARNING: untranslated string: dial profile = Connect with profile WARNING: untranslated string: dialing mode = Dialing mode: WARNING: untranslated string: dialup red not ppp = Dialup profiles can only used if RED is set to PPP Dialup
Check the networking setup. +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disabled = disabled WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: disk access = Disk Access @@ -709,6 +710,7 @@ WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules WARNING: untranslated string: empty = This field may be left blank WARNING: untranslated string: empty profile = empty +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable ignore filter = Enable ignore filter WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: enabled = Enabled: @@ -1603,9 +1605,6 @@ WARNING: untranslated string: smart information = S.M.A.R.T. information WARNING: untranslated string: smartwarn1 = Device: WARNING: untranslated string: smartwarn2 = reports S.M.A.R.T. error WARNING: untranslated string: smb daemon = SMB Daemon -WARNING: untranslated string: smbrestart = Restart samba -WARNING: untranslated string: smbstart = Start samba -WARNING: untranslated string: smbstop = Stop samba WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported diff --git a/doc/language_issues.es b/doc/language_issues.es index a7414c5fd..7b24eec97 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -585,6 +585,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits @@ -869,6 +872,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dnat address = Firewall Interface @@ -930,6 +934,7 @@ WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: email usemail = Activate Mail Service WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: entropy = Entropy diff --git a/doc/language_issues.fr b/doc/language_issues.fr index b6ab22001..470634f62 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -693,6 +693,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: socket options @@ -860,6 +863,8 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val zoneslave amount error WARNING: untranslated string: desired = Desired +WARNING: untranslated string: disable = Disable +WARNING: untranslated string: enable = Enable WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: guardian block a host = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index 759c21777..6f8ec84b6 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -666,6 +666,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits @@ -896,6 +899,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dns = unknown string @@ -937,6 +941,7 @@ WARNING: untranslated string: email tls explicit = explicit (STARTTLS) WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: email usemail = Activate Mail Service WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: error = Error WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 29e714dcd..41badf829 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -659,6 +659,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits @@ -896,6 +899,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dns = unknown string @@ -942,6 +946,7 @@ WARNING: untranslated string: email tls explicit = explicit (STARTTLS) WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: email usemail = Activate Mail Service WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: error = Error WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! diff --git a/doc/language_issues.pl b/doc/language_issues.pl index a7414c5fd..7b24eec97 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -585,6 +585,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits @@ -869,6 +872,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) WARNING: untranslated string: dnat address = Firewall Interface @@ -930,6 +934,7 @@ WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: email usemail = Activate Mail Service WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: entropy = Entropy diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 380f46043..9c9a60dc9 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -588,6 +588,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits @@ -872,6 +875,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: disk access = Disk Access WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip) @@ -934,6 +938,7 @@ WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: email usemail = Activate Mail Service WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: entropy = Entropy diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 62567ffc5..e5f558875 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -694,6 +694,9 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekey WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload +WARNING: translation string unused: smbrestart +WARNING: translation string unused: smbstart +WARNING: translation string unused: smbstop WARNING: translation string unused: smtphost WARNING: translation string unused: smtpport WARNING: translation string unused: snort hits @@ -874,6 +877,7 @@ WARNING: untranslated string: crypto warning = Cryptographic warning WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: desired = Desired +WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected WARNING: untranslated string: dns = unknown string WARNING: untranslated string: dns check servers = Check DNS Servers @@ -896,6 +900,7 @@ WARNING: untranslated string: duration = Duration WARNING: untranslated string: email tls explicit = explicit (STARTTLS) WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules +WARNING: untranslated string: enable = Enable WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: error = Error WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! diff --git a/doc/language_missings b/doc/language_missings index 6908166d9..d6b3db633 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -31,8 +31,10 @@ < dhcp server disabled on blue interface < dhcp server enabled on blue interface < dh name is invalid +< disable < dns could not add server < done +< enable < error the to date has to be later than the from date < g.dtm < g.lite @@ -222,6 +224,7 @@ < dh key warn1 < dh name is invalid < dh parameter +< disable < Disabled < disconnected < dl client arch insecure @@ -291,6 +294,7 @@ < email usemail < emerging pro rules < emerging rules +< enable < enable smt < encryption < entropy @@ -935,6 +939,8 @@ < bewan adsl pci st < bewan adsl usb < desired +< disable +< enable < g.dtm < g.lite < netbios nameserver daemon @@ -1034,6 +1040,7 @@ < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< disable < Disabled < disconnected < dl client arch insecure @@ -1080,6 +1087,7 @@ < email tls implicit < email usemail < emerging pro rules +< enable < enable smt < error < error the to date has to be later than the from date @@ -1405,6 +1413,7 @@ < dh key warn1 < dh name is invalid < dh parameter +< disable < Disabled < disconnected < dl client arch insecure @@ -1459,6 +1468,7 @@ < email tls implicit < email usemail < emerging pro rules +< enable < enable smt < error < error the to date has to be later than the from date @@ -1888,6 +1898,7 @@ < dh key warn1 < dh name is invalid < dh parameter +< disable < Disabled < disconnected < dl client arch insecure @@ -1957,6 +1968,7 @@ < email usemail < emerging pro rules < emerging rules +< enable < enable smt < encryption < entropy @@ -2748,6 +2760,7 @@ < dh key warn1 < dh name is invalid < dh parameter +< disable < Disabled < disconnected < disk access @@ -2819,6 +2832,7 @@ < email usemail < emerging pro rules < emerging rules +< enable < enable smt < encryption < entropy @@ -3467,6 +3481,7 @@ < dangerous < default IP address < desired +< disable < Disabled < disconnected < dns check servers @@ -3490,6 +3505,7 @@ < email tls explicit < email tls implicit < emerging pro rules +< enable < enable smt < error < error the to date has to be later than the from date diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 73f2c4d39..77aac5c0e 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -249,14 +249,34 @@ END print < -
- - - - -
-
-
+ +
+ + + + + + + +
+
+ + +
+ 		+
+ + +
+ 		+
+ + +
+
+ +
+
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index b907eb325..f13f05fb4 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -821,6 +821,7 @@ 'dialup settings' => 'Dialup Settings', 'directory mask' => 'UNIX directory rights', 'directory writeable' => 'directory writeable', +'disable' => 'Disable', 'disabled' => 'disabled', 'disconnect' => 'OVPN Stop / Disconnect', 'disconnected' => 'Disconnected', @@ -989,6 +990,7 @@ 'emerging rules' => 'Emergingthreats.net Community Rules', 'empty' => 'This field may be left blank', 'empty profile' => 'empty', +'enable' => 'Enable', 'enable ignore filter' => 'Enable ignore filter', 'enable javascript' => 'Enable javascript', 'enable smt' => 'Enable Simultaneous Multi-Threading (SMT)', From patchwork Tue Oct 13 16:07:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3561 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTw10D4z3x3M for ; Tue, 13 Oct 2020 16:09:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSy0Fhhz1J9; Tue, 13 Oct 2020 16:08:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSt3yfHz2xb4; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSs1qn8z2xBM for ; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSq4Zxbzwn; Tue, 13 Oct 2020 16:08:27 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ChE/fMpeSXm55g+rqWtPJoL5tBQ5Bw7uxUsdqNdkhIg=; b=I/LEzhq76NTDFBp3JpsdpaxpnqzKQwWT3gwbapLwDG0MBvuMrW2BxbiNCYYAvBy5ow+fdx n00XGRr6dX1t+uAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ChE/fMpeSXm55g+rqWtPJoL5tBQ5Bw7uxUsdqNdkhIg=; b=bkzSSJD2ma98YridwzM5Y1Rqfgw4FZ0DydqNkzGDN/Gg8MvErzDpHH7NVUVfl4+QJxjy3U sNcqPRQf/JG+s2zt1eKzi6vcgLs+2TDDNNPZEZRsiCJnHPguj5JGSyZ90x0yXaLQle3U65 bRCOaCDwRwDXCE9g4NpGXSqnKp5NOr+l9OMWsaG95E3bMBACxAyQwiZaaXy+/J8j6aZBbS oQFsLFWTQTbzG7RkVlrxY3Ei0uJ3OX1eclNSnVXnkeboezul7yIrvlDMYIILsC33YasVLF y8o79aZsu/9QzPrFU/EOp1EkC6550VPgRut4NfxskWNHef+DJI8D9UUapulPkA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 35/54] samba: Re-indent global settings table Date: Tue, 13 Oct 2020 16:07:53 +0000 Message-Id: <20201013160812.27754-35-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" No functional changes Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 143 ++++++++++++++++++++++++++++++----------- 1 file changed, 104 insertions(+), 39 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 77aac5c0e..598360c5e 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -277,45 +277,110 @@ print < - -
$Lang::tr{'basic options'}
- - - - - - - - - - - - - - -
$Lang::tr{'basic options'}
$Lang::tr{'workgroup'}

Wide linkson / - off
Unix extensionon / - off

$Lang::tr{'security options'}
$Lang::tr{'security'}
$Lang::tr{'encryption'}
$Lang::tr{'map to guest'}

$Lang::tr{'network options'}
$Lang::tr{'remote announce'}
$Lang::tr{'remote browse sync'}
-
- - - -
- -
- -
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
$Lang::tr{'basic options'}
$Lang::tr{'workgroup'} + +

Wide links + on / + off +
Unix extension + on / + off +

$Lang::tr{'security options'}
$Lang::tr{'security'} + +
$Lang::tr{'encryption'} + +
$Lang::tr{'map to guest'} + +

$Lang::tr{'network options'}
$Lang::tr{'remote announce'} + +
$Lang::tr{'remote browse sync'} + +
+ +
+ + + + + + +
+ + + + + +
+ + +
+
END ; From patchwork Tue Oct 13 16:07:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3565 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gVJ6tWYz3x1S for ; Tue, 13 Oct 2020 16:09:44 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSz40n2z1T0; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSv5gbrz305R; Tue, 13 Oct 2020 16:08:31 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSs34c6z304X for ; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSq5Y4Mz1Gj; Tue, 13 Oct 2020 16:08:27 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OPbywHyUegdVndnDuEQiS9PvScELNvOgrWoiKABJkY8=; b=AT742bw6og/rDsUCsnvLinEuryg2L1vQ/yKELSaesajP/eyxmmnuC6L+9Yys6zzNPOSIsR sXLSfwqsVHUzsXBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OPbywHyUegdVndnDuEQiS9PvScELNvOgrWoiKABJkY8=; b=CilTKPdIvSIXwb7ymThH+986AUXNgdHCUR0Thq+qZuxw4ozmx//s9ssyIpUa+DUO2emEzW 3qxj8dRg0r4/tgEQewoVBZLBraP4S3vAml2mDPD8uHobJtM2lcsPo9qB+QCJP2bhJ+uj8x ov/7709msJYhXprk4QiuQF9e8xJQkojZTfxCAF4kf8YZyMTPVVc4BRTdUiym4BwbEhz7ah X+RwtkJkVDGzL//JBGomCeZbx1NpuJELIoEzmWOwzDBwKtRf86TUoIj68gWRw7AgCCSTBf A8uy7u8+D+7NdR7LCM+XLv/GYZU2kr3OqBM4+3L+wkT2v2JgAjt+rQyJmMdWaw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 36/54] samba: Replace save icon with a button and remove legend Date: Tue, 13 Oct 2020 16:07:54 +0000 Message-Id: <20201013160812.27754-36-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 598360c5e..3f0bcf39f 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -365,18 +365,12 @@ print < - +
- @@ -384,19 +378,6 @@ print < -
-
- - -
- 		-
- - + + +
- - - -
$Lang::tr{'caption'}
$Lang::tr{'save settings'}
$Lang::tr{'restore settings'}
-END -; - } - &Header::closebox(); ############################################################################################################################ From patchwork Tue Oct 13 16:07:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3567 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gVx5Qg4z3x1S for ; Tue, 13 Oct 2020 16:10:17 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSz4DsWz1Fr; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSv6SB2z305Z; Tue, 13 Oct 2020 16:08:31 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSt26Bfz304m for ; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSq6K0Xz1JF; Tue, 13 Oct 2020 16:08:27 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yppNYSBOk5dGzf5cFWvFecqk45miX/y6yUGEYw5mgjg=; b=OeiHlZDxMkGd3hJq8hKvF0FAaP0YDhTuuW4Iye18b2qtalieL+vGvU5e53h8NrDEUTcwtD wUWXnnXGYOJrYjBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yppNYSBOk5dGzf5cFWvFecqk45miX/y6yUGEYw5mgjg=; b=k7b8/hju0xeD+cLdIXn59PGeyZOtrTaN17edikQs0b2YzCKrMHyKQyOplnKCVFE7NWKpHJ 0zlJ8RinN7YUaNS8KCx+XXIS5DttTIVF3hC+B9iQuhfmZhrOMVMxUmXNMz8nPOyzVP+PiD y7SepRi0NdDmwcCpWG1lJSyMHBk5tBiTE+Y19Gn1BVNeE6axMFdX27JJsKESGXX5Yvhc05 vm6gSborJt22ARBSI5QO01bE3a4L8NmG8O2t54pOHx4Um/50zccGHm5bnzTTsxb4g5c74a h34g8hVEHYjC+EB1Fr1u2z4tHSnojWpeukZ0ewRz0Zl99OO5dPEdqsIe7n7Dnw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 37/54] samba: Remove more legends Date: Tue, 13 Oct 2020 16:07:55 +0000 Message-Id: <20201013160812.27754-37-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" These are not helpful and any documentation should be living in the wiki Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 51 +++--------------------------------------- 1 file changed, 3 insertions(+), 48 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 3f0bcf39f..59e397747 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -480,37 +480,11 @@ END
END ; - if ($sambasettings{'ACTION'} eq 'usercaption') - { - print < - - - - - - - - - - -
$Lang::tr{'caption'}
$Lang::tr{'add user'}
$Lang::tr{'pc add'}
$Lang::tr{'delete user'}
$Lang::tr{'delete pc'}
$Lang::tr{'activate user'}
$Lang::tr{'deactivate user'}
$Lang::tr{'change passwords'}
$Lang::tr{'save config'}
-END -; - } - if ($sambasettings{'ACTION'} eq 'userchangepw') { my $username = "$sambasettings{'NAME'}"; @@ -683,31 +657,12 @@ print <
- - -
END ; -if ($sambasettings{'ACTION'} eq 'sharecaption') - { - print < - - - - - - -
$Lang::tr{'caption'}
$Lang::tr{'add share'}
$Lang::tr{'edit share'}
$Lang::tr{'save config'}
$Lang::tr{'delete share'}
-END -; - } - -if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optioncaption' ) +if ($sambasettings{'ACTION'} eq 'shareadd') { print < @@ -725,7 +680,7 @@ END ; } -if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'optioncaption2' ) +if ($sambasettings{'ACTION'} eq 'sharechange') { my $shareoption = $shares{$sambasettings{'NAME'}}; print < X-Patchwork-Id: 3563 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gV50dqBz3x1S for ; Tue, 13 Oct 2020 16:09:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSz4j8Zz1T8; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSw012Tz304j; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSt2ksTz305M for ; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSr04V6z1JH; Tue, 13 Oct 2020 16:08:28 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3ixsPffW0YoIPNhrHOIE6K6ng2L+LJlAoyYzT5e6v8g=; b=ArjUsQkBMz8jdOfBdVQ9XBn7ZfAVzUbqbkPyd+dYGdmOL6XCuHhAXJfZ5Q6GWJkeZlLsSY s4XCPq/gmxK1ldCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3ixsPffW0YoIPNhrHOIE6K6ng2L+LJlAoyYzT5e6v8g=; b=Po3dd+Bhh4jDe2c7OFpZ/PGZXiXdW2PnnLe8TEVXOQ8JW18kdzpCtQq5KB4tWuyM1wevf3 YlwxdQl6n+Gk4+2ef3GPqHekOjVYwYfIcr7JlPaFPI0N6zf6qfa+SacODNe6H0UXSBi8D6 Np66LFrvCpMfEw5iatMsaDx3YXEL7GNI01mk2Jm+gwSreozB2CQn5tFhMydEJ5n6oQ3KuX /MDuaZqOIJv1//w91pX2ZC9RdgUrlA2tw5tn0pCtNO/rCjAcPXqAbLHlKj/f/iCMJlRIXb P52Yioa/DPmGfQItB806PAX3IwYJyJ20Uikle8zHxF43uGyft2lh9e4omz4gxQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 38/54] samba: Remove unused anchors Date: Tue, 13 Oct 2020 16:07:56 +0000 Message-Id: <20201013160812.27754-38-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 3 --- 1 file changed, 3 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 59e397747..7d5b4336c 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -387,7 +387,6 @@ if ($sambasettings{'SECURITY'} eq 'user') { &Header::openbox('100%', 'center', $Lang::tr{'user management'}); print <
@@ -609,9 +608,7 @@ END my %shares = config("${General::swroot}/samba/shares"); - print <
From patchwork Tue Oct 13 16:07:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3569 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gW60jT4z3x1S for ; Tue, 13 Oct 2020 16:10:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSz503hz1TJ; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSw0l7hz305y; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSt3khQz305n for ; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSr0mmJz1Hr; Tue, 13 Oct 2020 16:08:28 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/BwF6mWLR14wYJ2Mormawzi7xwLuAAKdYJScRUIFJ8A=; b=1/dOZ/MHTBnknsCPGXdCv8t6IfzZnEUyMsCJiv+jOA9VrDgmrQ1e8u7S3IrVFR6NnoPgxp 79cBfdnzb8iBHjDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/BwF6mWLR14wYJ2Mormawzi7xwLuAAKdYJScRUIFJ8A=; b=I0u7w23cDNhOF9UpaIuH6+omFDNe2CC/nHNIUCvVy4620x+ZzGlhzEfa+8oHzFHGznJnU3 0TT7pXQYn5LoOto2diDHPt2taskgd7ab21lupDkWC8koW6+ksqHy5XFgGxkj8v25kKwCuh ZJ2v5b+/zagYd8ElIcV6NIKJ6tfGEOxzHJzN9CLusvf0Dd9BBwzEZOkTkx0aT3xGKOkDdA Xy09cYUXOWq4EHzGAeNi9F8J/fdjETBWsS0xBGVcfFvA0h0PrNv3aLFEvkP9NVcYSGTHcq 3ZBHBi/lqHoKJIZCFSG0PDnfVGsx45Vvj8mKKGfGZk088MeqyXP54HC8eC5qmQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 39/54] samba: Refactor shares section Date: Tue, 13 Oct 2020 16:07:57 +0000 Message-Id: <20201013160812.27754-39-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 165 ++++++++++++++++++++++++----------------- 1 file changed, 95 insertions(+), 70 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 7d5b4336c..a64fc9177 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -608,94 +608,119 @@ END my %shares = config("${General::swroot}/samba/shares"); -print < -
$Lang::tr{'manage shares'}
- - +print < + + + + END -; -my @Shares = keys(%shares); +my @shares = keys(%shares); my $lines = 0; my $col=""; -foreach my $shareentry (sort @Shares) - { +foreach my $shareentry (sort @shares) { chomp $shareentry; + if ($lines % 2) { - print ""; - $col="bgcolor='$color{'color20'}'"; + $col = "bgcolor='$color{'color20'}'"; } else { - print ""; - $col="bgcolor='$color{'color22'}'"; - } - print <$shareentry - - -END -; - $lines++; + $col = "bgcolor='$color{'color22'}'"; } -print < -
-
$Lang::tr{'manage shares'}
$Lang::tr{'sharename'}$Lang::tr{'options'}
$Lang::tr{'sharename'}
- - - -
- - - -
- - -
- - -
+ print < + $shareentry + +
+ + + +
+ + +
+ + + +
+ + END ; + $lines++; +} -if ($sambasettings{'ACTION'} eq 'shareadd') - { - print < - - - - +print < -
-
$Lang::tr{'add share'}
- + +
+ +
-
+ + +
+
+ + +
+
END -; - } -if ($sambasettings{'ACTION'} eq 'sharechange') - { +if ($sambasettings{'ACTION'} eq 'shareadd') { + print < + +
+ + + + + + + + + + +
$Lang::tr{'add share'}
+ +
+ + +
+
+END +} + +if ($sambasettings{'ACTION'} eq 'sharechange') { my $shareoption = $shares{$sambasettings{'NAME'}}; - print < - - - - -
$Lang::tr{'edit share'}
-
- - -
- -
+ + print < + +
+ + + + + + + + + + + + +
$Lang::tr{'edit share'}
+ +
+ + +
+
END -; - } +} if ($sambasettings{'ACTION'} eq 'smbshareadd') { From patchwork Tue Oct 13 16:07:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3564 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gV91KwZz3x1S for ; Tue, 13 Oct 2020 16:09:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSz56BVz1TR; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSw1MGnz3060; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSt44Yrz305G for ; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSr23ZGz12S; Tue, 13 Oct 2020 16:08:28 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pTtvO8+RYHcqQJIaFLjYNcfRNt9ZVCAND+IPYpSietk=; b=Q+yvy5gMvtzWdNO4js/GZpHublJbZifSaJw/gP1rhl1VLUNTgRAesGaFsU/aM1/wqOPxk7 nSrkJFPfSwOz+RDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pTtvO8+RYHcqQJIaFLjYNcfRNt9ZVCAND+IPYpSietk=; b=jcOwP/RKW13eyR5VWuM/pVT8e5+FtyaIPH61ALSKK5/mCctIYg2bpO9ygh6VDKN5HXbqbi 3GFbqw4pSRAY3APEs+S0vWFMrqYqBsO86a9doPOn40mE/i5UgG/BFne0LnO4NzfrU7c6tJ YY83rzrno9ywKrkZWntu3ihh/SrXADHmSjKWeG+jlMZFzTBK1vd2tKKseazL9PXh2qbc3E TTpnI6RyHyex1amoYDitxLn+Xp0P2vXHQiLgncWqqfj2MHMyZErhHgloFbKfEqEN1yNCj/ GqNKA6oKJnUdtCUSs5b+w8M9jIlGbkSK1aKTPDU2GLwro1FzmPSQgmdBiOTXjA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 40/54] samba: Refactor status area Date: Tue, 13 Oct 2020 16:07:58 +0000 Message-Id: <20201013160812.27754-40-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" There is no need to double-wrap the status output in tables. Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index a64fc9177..66043f15b 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -37,9 +37,6 @@ my %mainsettings = (); my $message = ""; my $errormessage = ""; -my $Status = qx(/usr/local/bin/sambactrl smbstatus); -$Status = &Header::cleanhtml($Status); - my $userentry = ""; my @user = (); my @userline = (); @@ -746,16 +743,17 @@ if ($sambasettings{'ACTION'} eq 'smbsharechange') ############################################################################################################################ ############################################### Anzeige des Sambastatus #################################################### -&Header::openbox('100%', 'center', 'Status'); +&Header::openbox('100%', 'left', $Lang::tr{'status'}); -print < - - - -
$Lang::tr{'samba status'}
$Status
+my $status = qx(/usr/local/bin/sambactrl smbstatus); +$status = &Header::cleanhtml($status); + +print < + 
$status
+ END -; + &Header::closebox(); &Header::closebigbox(); From patchwork Tue Oct 13 16:07:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3568 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gVz3YSYz3x1S for ; Tue, 13 Oct 2020 16:10:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT00J7xz1Th; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSw2jLQz305T; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSt6KFVz2ycs for ; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSr36kgz1Gt; Tue, 13 Oct 2020 16:08:28 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7pX4M+rLa2aJqXBCEFhE7o+NBlBZWaxlnNzfBMYkr9I=; b=jt89wz4AoIgWraNacOlVD3t3eJkknaVt9htGrLKggtxrdlt6EgZMrriEs9TWmZIOri9sUc wSoGPJdqhnG5NtDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7pX4M+rLa2aJqXBCEFhE7o+NBlBZWaxlnNzfBMYkr9I=; b=AIU0KzcWdQKpY3tqOxttb4CmCGvX1OhobIw6+ndX4QrTplXP+cnaa5E7qTLtjB8Bo7RnW7 HGX8xflbLtj759YZCytEQd/XO8gUxBX8uKX8xwNvPj771nf8X80Pl95pJe/UUuLZ53egF5 b+EYEgtt2A6ip9ARwNELOw9qKYEV0S0Nnp6yry5JAq1ILaTBeaO1H1lWMc5SwoYmDoJTJv yrzVKfOuUDz7Nnl1XePU2eO8B24ZOu4sLNx0G7Tn3LXaFlNg54cKyEGWjaAIP7OUkK1jqh 0u9EkxLfk6uDeXsdcAFfsSjiNjVkuyH0ghXFYSkT0hggKEuJL8MCvfsDFj/1kA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 41/54] samba: Use full page width for all tables Date: Tue, 13 Oct 2020 16:07:59 +0000 Message-Id: <20201013160812.27754-41-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 66043f15b..43d351e98 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -227,7 +227,7 @@ my %servicenames = ( ); print < + @@ -249,7 +249,7 @@ print < -
$Lang::tr{'all services'}
+
@@ -275,7 +275,7 @@ print < - +
@@ -385,7 +385,7 @@ if ($sambasettings{'SECURITY'} eq 'user') &Header::openbox('100%', 'center', $Lang::tr{'user management'}); print < -
$Lang::tr{'basic options'}
+
@@ -488,7 +488,7 @@ END print < -
$Lang::tr{'accounting'}
$Lang::tr{'username'}$Lang::tr{'password'}
+
@@ -511,7 +511,7 @@ END print < -
$Lang::tr{'change passwords'}
$Lang::tr{'username'}
$Lang::tr{'password'}
+
@@ -533,7 +533,7 @@ END print < -
$Lang::tr{'add user'}
$Lang::tr{'username'}
$Lang::tr{'password'}
+
@@ -558,7 +558,7 @@ if ($sambasettings{'SECURITY'} eq "ADS") { -
$Lang::tr{'pc add'}
$Lang::tr{'client'}
$Lang::tr{'unix group'}
+
@@ -606,7 +606,7 @@ END my %shares = config("${General::swroot}/samba/shares"); print < + @@ -670,7 +670,7 @@ if ($sambasettings{'ACTION'} eq 'shareadd') {
-
$Lang::tr{'sharename'}
+
@@ -699,7 +699,7 @@ if ($sambasettings{'ACTION'} eq 'sharechange') { -
$Lang::tr{'add share'}
+
From patchwork Tue Oct 13 16:08:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3562 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTz1Z0Sz3x1S for ; Tue, 13 Oct 2020 16:09:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSz5SWsz1TW; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSw242Gz3063; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSt4Yppz305s for ; Tue, 13 Oct 2020 16:08:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSr6s2lz1JL; Tue, 13 Oct 2020 16:08:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MEII3VjszL2w0ygUHQ/wtsn3OyzuvRVgq8n8YrBW0xc=; b=PE3R8IMbSRw9xMn1TRMT7JwehaWeQqbTnrvYY2P1ON5MfzZhUZwO9mliEml/IbeVwm6kp0 RyYb5kRBFmyivbdAHCED3OSFGyLfxOZG7As9jo9k3PsHJG7Gufd09r7+ylh3SpTRhMQCyd q0pS2fwupKCZaCloP2+4r0OyM+GbHaCy+0rOZ1u4R0zdXc+24GzYxRFM1nRSNydnM+/AdD jtYLEAJIFdKAGzfa6qssvYOPhTDOx8lCyeAASBoiyTj9/dBSiqRXjIjz0slkWdfeKdnwWx aNKKAVUlwhHUgpu6agW9ndbLjUIYK9whfX8/iWhSh+YG13S+gQjz+AxlaedePQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MEII3VjszL2w0ygUHQ/wtsn3OyzuvRVgq8n8YrBW0xc=; b=nc9ILhwVs/QnbkhyRsXhKyyQrJlC8MvHENpUu6q46Gk7RNPKkME+BVX2fCd2uSGvF27/tE Sn4TuoS2vPR+8ZAA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 42/54] samba: Enable support for Apple's OS X by default Date: Tue, 13 Oct 2020 16:08:00 +0000 Message-Id: <20201013160812.27754-42-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 43d351e98..d9c5f3f29 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -156,6 +156,9 @@ winbind use default domain = yes # Log to syslog logging = syslog +# Enable support for Apple +vfs objects = catia fruit streams_xattr + END ; From patchwork Tue Oct 13 16:08:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3571 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gW76qftz3x3M for ; Tue, 13 Oct 2020 16:10:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT15ht3z1V6; Tue, 13 Oct 2020 16:08:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSz4wJ7z304V; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSv66wWz305W for ; Tue, 13 Oct 2020 16:08:31 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSs2Vp7zwn; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jBp6eva8u1OK+R3EYelK9zSXqWKJUHxJmML6mZ7s1W4=; b=/TtSA4Ior3ie8tgjn9w2IZZHhrLh+FHyqAFPCyzwAlEvXRbJYDauXLpPI9aHttZEZm1Mb4 U+w+Ipx2UpmV0gDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jBp6eva8u1OK+R3EYelK9zSXqWKJUHxJmML6mZ7s1W4=; b=F/WKExZR2DrfI8qPY5R4u5E+m+wRljiPyZqaPruEVfw1DRgixHiZj8FtN7f3WG2sg99THN 7OdfbupckDTJlf33bxymbYVGavBplm6XT1nPw3LiU90y6xy1hWrEONN1ZwEIj2RehN6rbP LqaJHYvrIN+8pfFtHO4HcqhA7q9y/UTABawCDIdQLJCBwhEXvGNdL+RQlLeTj4+PBwHoTj CCd+IXHuIgWo6QNXUv5ZOOlgD0EP/4RoGDLHbzZF7J0WlTf9YS0wHdKimvsd/3Dotz3usj d5XlI5Xq+HThWXDuoUU8ub2PEHZXBzdgo5xbyD7nBLVQu0JiX90keDsmuCBW9w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 43/54] samba: Drop choice to enable/disable wide links/UNIX extensions Date: Tue, 13 Oct 2020 16:08:01 +0000 Message-Id: <20201013160812.27754-43-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 38 +++----------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index d9c5f3f29..f46ab7ee3 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -65,8 +65,6 @@ $sambasettings{'REMOTEANNOUNCE'} = ''; $sambasettings{'REMOTESYNC'} = ''; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Bad User'; -$sambasettings{'WIDELINKS'} = 'on'; -$sambasettings{'UNIXEXTENSION'} = 'off'; $sambasettings{'ENCRYPTION'} = 'optional'; ### Values that have to be initialized $sambasettings{'ACTION'} = ''; @@ -77,9 +75,6 @@ my $LOGLINES = '50'; &General::readhash("${General::swroot}/samba/settings", \%sambasettings); &Header::getcgihash(\%sambasettings); -if (($sambasettings{'WIDELINKS'} eq 'on') & ($sambasettings{'UNIXEXTENSION'} eq 'on')) - {$errormessage = "$errormessage
Don't enable 'Wide links' and 'Unix extension' at the same time"; } - &Header::openpage('Samba', 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -115,9 +110,6 @@ if ($sambasettings{'ACTION'} eq $Lang::tr{'save'}) delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'}; &General::writehash("${General::swroot}/samba/settings", \%sambasettings); -if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} = "yes";} else { $sambasettings{'WIDELINKS'} = "no";} -if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'} = "yes";} else { $sambasettings{'UNIXEXTENSION'} = "no";} - ############################################################################################################################ ############################################# Schreiben der Samba globals ################################################## @@ -134,9 +126,6 @@ workgroup = $sambasettings{'WORKGRP'} realm = $mainsettings{'DOMAINNAME'} passdb backend = smbpasswd -wide links = $sambasettings{'WIDELINKS'} -unix extensions = $sambasettings{'UNIXEXTENSION'} - map to guest = $sambasettings{'MAPTOGUEST'} security = $sambasettings{'SECURITY'} @@ -159,6 +148,9 @@ logging = syslog # Enable support for Apple vfs objects = catia fruit streams_xattr +# Enable following symlinks +wide links = yes + END ; @@ -201,12 +193,6 @@ if ($message) { ############################################################################################################################ ########################################## Aktivieren von Checkboxen und Dropdowns ######################################### -$checked{'WIDELINKS'}{'off'} = ''; -$checked{'WIDELINKS'}{'on'} = ''; -$checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} = "checked='checked'"; -$checked{'UNIXEXTENSION'}{'off'} = ''; -$checked{'UNIXEXTENSION'}{'on'} = ''; -$checked{'UNIXEXTENSION'}{$sambasettings{'UNIXEXTENSION'}} = "checked='checked'"; $selected{'ENCRYPTION'}{'optional'} = ''; $selected{'ENCRYPTION'}{'desired'} = ''; $selected{'ENCRYPTION'}{'required'} = ''; @@ -292,24 +278,6 @@ print <
 - - - - - - - - - - - - From patchwork Tue Oct 13 16:08:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3572 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gWL3HJCz3x1S for ; Tue, 13 Oct 2020 16:10:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT15TFRz1Tx; Tue, 13 Oct 2020 16:08:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSz4KYlz2ytS; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSv611Jz305D for ; Tue, 13 Oct 2020 16:08:31 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSs3lXzz1KW; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WAjgq9Ce8VWx23z8dxQTgV52agbKgf7LlqJXm6hsHN4=; b=tYLIwfbT74I81lOopdQSdwvYCXR+vdMuCMtibrU8BT572jANhMzKDzpaAn68mwbuS0zdT/ 4Nu4IJTWIhEKLcAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WAjgq9Ce8VWx23z8dxQTgV52agbKgf7LlqJXm6hsHN4=; b=nb0xyeS3/J0oZTf1XoqVjZ5Yp5cnO6UffW7OXUUEb55G2R6wFgil6QbABdcc+M88LTLJnL o/y4Jw/55lERv1UO0EywFBXQ8AopL0eirYnF7caksZGx+urq0kB02ftlevCYW0dxwld4wD Fg1K9e6YeKd5PgYEG4fclm7YGw4TkIOBZI/IDvuUJBtg3nBwg8SL/w8T8ZN0BMG/BnIkFV wocYjD9+9a2s+YA/Lway+TWE6flqNnNH7XlvchlE0+uNb6ASctKxFO7ICWdJBMP/Pvzygs 5IuWyymV9uWEu6rki6XrrBKxNdev5pHI5dKmgcFvJoje5a3+9tluR9gAyUAogA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 44/54] samba: Add recycle extension, too Date: Tue, 13 Oct 2020 16:08:02 +0000 Message-Id: <20201013160812.27754-44-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index f46ab7ee3..e58d82004 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -146,7 +146,7 @@ winbind use default domain = yes logging = syslog # Enable support for Apple -vfs objects = catia fruit streams_xattr +vfs objects = catia fruit streams_xattr recycle # Enable following symlinks wide links = yes From patchwork Tue Oct 13 16:08:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3566 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gVS1ddCz3x1S for ; Tue, 13 Oct 2020 16:09:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT12BX2z1F3; Tue, 13 Oct 2020 16:08:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSw3DBcz3067; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSv1wkYz2xBf for ; Tue, 13 Oct 2020 16:08:31 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSs4hjGz1Kb; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EiByHApHMkmbw5sI1azZnD6xATFIeWHpPXtVoRr5eV8=; b=AvvLO71LGxiGYrucq8Hxhl/DkKt9pGcfk/FHvj0+tIGoaToZxg8xvccCG/vMXDL6u4Mdyw 48+qYGl0XQrmlxBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EiByHApHMkmbw5sI1azZnD6xATFIeWHpPXtVoRr5eV8=; b=dRQTBajysehyH8CLvOo6C4ywZgDqlEpXxygnMd4wi5sW/7n+ob2ASLxkGRkmaY+I0hM36J C3mDvFOpP2K12bCC7egbTpLbN115fFDPLj5AchNJ/86dvzq4dg6taD3lD+2fm30zZfEtva SEf8W8BHeQS5Nwpn5NqlXvPgxa5hLF7M1E07nY1KUgsed93/NHlVPH3KyEWfjG1CQ5z4wg 7qd7/CsDch/0Ky8RQqc+v5eBIbSU8suxKXa3eUzf/6O0LTmNoy03/13zM9ZeiRFFoGHQXO s4F4Z6fWWOBHqcesXgLAmMuJrKyHq803MYy6WVpWNNEVBH2uzJtJJDaewiPFaQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 45/54] samba: Change share template to something more safe Date: Tue, 13 Oct 2020 16:08:03 +0000 Message-Id: <20201013160812.27754-45-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index e58d82004..0ea3cc789 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -43,7 +43,7 @@ my @userline = (); my $userfile = "${General::swroot}/samba/private/smbpasswd"; my %selected= () ; -my $defaultoption= "[Share]\npath = /var/ipfire/samba/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\npublic = yes\nforce user = samba"; +my $defaultoption= "[My Share]\npath = \ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0644\ndirectory mask = 0755\npublic = yes\nforce user = samba"; my %shares = (); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); From patchwork Tue Oct 13 16:08:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3570 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gW71Rx8z3x1S for ; Tue, 13 Oct 2020 16:10:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT15jzSz1V8; Tue, 13 Oct 2020 16:08:37 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSz5SKBz304N; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSw68QXz2yCq for ; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSs6NK6z1GD; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Erly83/aIPpZGQKUUqaBLRRQ9Eq/YIUFcyoiXeOPThk=; b=iLXKxgutw0GQXY2iuzppS34Idy3EsGc5hqIiyGNmqNk+OPN1wpMFOXVw13cxUEhPdNW9h5 X255Is2bZW/US0Ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Erly83/aIPpZGQKUUqaBLRRQ9Eq/YIUFcyoiXeOPThk=; b=g1IPMxSvYCTfpXNVgizvfiwjVYRiUZsUdry/+YQOYCrG8YeLb7+FQn+3HZI5OeTddRbgn1 S1YMq6S2hx3arqEgavxrw6c6mjT84mWqMBPrvTetmTWMUjUrR09zWn009mBm6ovk+HGnkD R7VrsNt5p8YNxWSsvpC97e8DH3EcF7PFfJF9xNhc+mzkjZ5JFgpUKIUhgJvE+QI0ogJZ57 N9nH91rkNJalJnUxvGiGJpG/orJGCf1hXrGx+p8MVk8WsalFuIGL0rjG3N4oCNf/nZhnPV lAIEQqAx3PtiDLbrZI1jcFUX8BuWKS2hM3WDU25WKfT9LpCiLh3aMQHGbF18Mw== 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> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 = 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 < @@ -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 < @@ -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', From patchwork Tue Oct 13 16:08:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3573 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gWM1mCMz3x3M for ; Tue, 13 Oct 2020 16:10:39 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT21GbRz1VV; Tue, 13 Oct 2020 16:08:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSz66psz304s; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSx2L8hz2yrM for ; Tue, 13 Oct 2020 16:08:33 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSv2XShz1HZ; Tue, 13 Oct 2020 16:08:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pVfeBP95x5JpLPp6UXMrwf1XMPhKu6GpuDITaP/OHcI=; b=DXfg2+oO4gzWWXYPZ/HHV6yhLp6TICXEYwkyoy2imUUwRHjfWo9H+h5xAGHwqODd7bUB4H k36qddMDKq8epBaSevT41NtO0+3WeXggNexoWki/FqyBiIkFaSmPe6y01N/U6iS18nuaEu cjaK9UE0gm3NHiWPu3eeswUhXWacJd1YlOevqRuJ8mDDfgeuXEtLSXLdIj5ss60rhdX510 wEaJgZumgUdibBtKKYNBq6NHAeXgnTzgQ/AlKjfsWnk5n6dJitGQVWmWbd2f40VQTq7ajZ +6KZk16dDLpyXSnzC3TJA9qWxYnVgUdISJgesOasbGbmMwyP5cbfcJgLpr/DEw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pVfeBP95x5JpLPp6UXMrwf1XMPhKu6GpuDITaP/OHcI=; b=cy2TcSN2xXs83skQiZ4qzve5cf13NUjQBzPk77X0f3Uad9NzyFG3gChS5MBSKHJH+ASnhS ulkeJw+n5snflSCA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 47/54] samba: Automatically migrate role setting Date: Tue, 13 Oct 2020 16:08:05 +0000 Message-Id: <20201013160812.27754-47-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- src/paks/samba/install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh index 8b61298d5..22d74b93a 100644 --- a/src/paks/samba/install.sh +++ b/src/paks/samba/install.sh @@ -42,8 +42,12 @@ sed -i /var/ipfire/samba/smb.conf \ -e "/^syslog/d" \ -e "s/^security = share$/security = user/" +# Migrate SECURITY to ROLE sed -i /var/ipfire/samba/settings \ - -e "s/^SECURITY=share/SECURITY=user/" + -e "s/^SECURITY=ADS/ROLE=member/" \ + -e "s/^SECURITY=server/ROLE=standalone/" \ + -e "s/^SECURITY=share/ROLE=standalone/" \ + -e "s/^SECURITY=user/ROLE=standalone/" # Start the service /usr/local/bin/sambactrl smbstart From patchwork Tue Oct 13 16:08:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3578 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gWg16NGz3x3M for ; Tue, 13 Oct 2020 16:10:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT23YY7z1G2; Tue, 13 Oct 2020 16:08:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSz6fkYz304x; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSx4yLhz2xBM for ; Tue, 13 Oct 2020 16:08:33 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSv42J5z1Q4; Tue, 13 Oct 2020 16:08:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NgCitrLqEj/coGMvXbE8QIntDVMa7IglRDNiMYc9EI0=; b=uNYae0JMdbmiWkO1b0KE6PMCkCE/prR3An7y9aEMPNE2+szqwUCDLEN6OEQn4IssgoX0rY D6nVgss/nrn6ViBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NgCitrLqEj/coGMvXbE8QIntDVMa7IglRDNiMYc9EI0=; b=sgdt1dEx++oKFXwsTf4UiBe+4wsgL6ZyOqYUzzSO3u2MMoCdH3U/5z9UtylRMY9V+jKpNK aCjmDYteHsGxava3WwwpC8HdLgS2nxocYVBaetctkwjjn3mPxNAFiU8jqUlLc00c8uM+GM BQMqT08mpMZHuBhTXw8cg+fLQOWAu7uz46mhZBYp3SCJzcry8NmhyYRbRz/t1jtRByBLlr ElT9TmTSl14YyADJbEqmRorpC2gx9vm/xi/UXEX292t1H8ChZkoKFfNJp9Qcucaft4KZAd CEfaPFooK8IVaLUiJS+qIzomlKpnhYjjNaN/gjGXdmM0oMWPRJIf6ZR+MlV7jA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 48/54] samba: Remove tbl class from join form Date: Tue, 13 Oct 2020 16:08:06 +0000 Message-Id: <20201013160812.27754-48-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index aa91267a7..1504b8d3e 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -535,7 +535,7 @@ if ($sambasettings{'ROLE'} eq "member") { -
$Lang::tr{'edit share'}
Wide links - on / - off -
Unix extension - on / - off -

$Lang::tr{'security options'}
$Lang::tr{'security'} - + +
+
@@ -632,7 +632,7 @@ foreach my $shareentry (sort @shares) { - + From patchwork Tue Oct 13 16:08:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3576 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gWb5qvpz3x1S for ; Tue, 13 Oct 2020 16:10:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT30v9pz1Vx; Tue, 13 Oct 2020 16:08:39 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gT224jZz2xb8; Tue, 13 Oct 2020 16:08:38 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gT03vVPz2xkD for ; Tue, 13 Oct 2020 16:08:36 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSy2BNnz1JF; Tue, 13 Oct 2020 16:08:34 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z4rY/zOOBfvYt8LlmzAWjsT7jWdTmeMs1ju2DJDK+Bg=; b=yV2Dp4rXMFpstAO1bkiaN4Q2BBZRTQeDcC64AJEwTDWYVtEJYKjJvCFRRqomNpmisGlTSi Hoep29TpV0IeDKBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z4rY/zOOBfvYt8LlmzAWjsT7jWdTmeMs1ju2DJDK+Bg=; b=qen79CbE6y6ucHFC46T/MHLaLpBEM3OM7mmDGA4NrrEe9ky7t4OkOo5pOydn4zBfRvKfxk 8XaKNx7AUPVYLbQ0j7OqIcQftuL8/KrizoZjVne3JUAIR4yPEJA4JWiNt7FPGu796GuaO/ FfzFDrwTIt31pwq/ZOJmRUu4yHfrXTcTig0eoTKQwXf18o3bHiuXNU0thZFEIajZOj0asW bD2m0sR4EG9ChnGRwVG5NAm+niTwrAJRkM3d5tWKHSnsmttLghkRFqNa4KEkIe5MvPY0Rr yvzyr5sOXKoi2gE5k+PiOurLyvePxlmuDBtBKXfPYsbqylPd5O/9VPvk3r+Imw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 52/54] samba: Remove unused INTERFACES setting Date: Tue, 13 Oct 2020 16:08:10 +0000 Message-Id: <20201013160812.27754-52-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 1 - 1 file changed, 1 deletion(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index deb79b9c8..ec1237134 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -59,7 +59,6 @@ my %shares = (); #################################### Initialisierung von Samba Variablen fr global Settings ############################### $sambasettings{'WORKGRP'} = uc($mainsettings{'DOMAINNAME'}); -$sambasettings{'INTERFACES'} = ''; $sambasettings{'ROLE'} = 'standalone'; $sambasettings{'REMOTEANNOUNCE'} = ''; $sambasettings{'REMOTESYNC'} = ''; From patchwork Tue Oct 13 16:08:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3579 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gWt6s8vz3x1S for ; Tue, 13 Oct 2020 16:11:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT508hnz1WR; Tue, 13 Oct 2020 16:08:41 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gT33t5yz304T; Tue, 13 Oct 2020 16:08:39 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gT13Vz7z2xkD for ; Tue, 13 Oct 2020 16:08:37 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSz2zjJz1Fn; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fgSgx4mTNvuP37MV8dAqXxm466/jofM9+9DE2hqjh2s=; b=4q938RYpVQx72znBTMGW9wDir5p+Ru02Lg8OhU54Wwe+wKQ4nvN/picr1U8garSZMa6Pdj AgReQueG+rZ3voDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fgSgx4mTNvuP37MV8dAqXxm466/jofM9+9DE2hqjh2s=; b=iNetXwxwAH1FaFQKNLlWW62FI33EiY5GyzfrLfr7i1OTxbiODMSzs9I5vx6dN0x8jj2LfL 3ChmnisjLhyT8DyvmHI7/Q6SxV5mk1X76dzYOyao78K+12W4c8lnsfLmtCgcV9rdPBcDZJ 3z1LBXFvgIWwyyL2xSt2VtfnCSSBAiLim5VShgMIgTNCwiwIynvzAoNT8vjfmom35MwJq5 rnTkqM2s9H6Bt7gedbcmE0Qu7u0MMmFOu91yK3UDeYSXfL+JN0NdIDjJPkEZJ5cHQv4WpA nQpaBkk3Ty+PppGLn5ZfCwo6GfR4wiJ1zhW29QHJceqSA3AA2rcIY5j+f6H24g== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 53/54] samba: Allow rewriting configuration from CLI Date: Tue, 13 Oct 2020 16:08:11 +0000 Message-Id: <20201013160812.27754-53-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 152 ++++++++++++++++++++------------------ src/paks/samba/install.sh | 12 +-- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index ec1237134..be670a95e 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -50,11 +50,6 @@ my %shares = (); &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); -############################################################################################################################ -############################################# Samba Dienste fr Statusberprfung ########################################## - -&Header::showhttpheaders(); - ############################################################################################################################ #################################### Initialisierung von Samba Variablen fr global Settings ############################### @@ -72,7 +67,17 @@ my $LOGLINES = '50'; ############################################################################################################################ &General::readhash("${General::swroot}/samba/settings", \%sambasettings); + +# Hook to regenerate the configuration files. +if ($ENV{"REMOTE_ADDR"} eq "") { + &writeconfiguration(); + exit(0); +} + +&Header::showhttpheaders(); + &Header::getcgihash(\%sambasettings); +delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'}; &Header::openpage('Samba', 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); @@ -100,81 +105,19 @@ if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl s ############################################################################################################################ ##################################### Umsetzen der Werte von Checkboxen und Dropdowns ###################################### -if ($sambasettings{'ACTION'} eq $Lang::tr{'save'}) -{ ############################################################################################################################ ##################################### Schreiben settings und bersetzen fr smb.conf ####################################### -delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'}; -&General::writehash("${General::swroot}/samba/settings", \%sambasettings); - -############################################################################################################################ -############################################# Schreiben der Samba globals ################################################## - - open (FILE, ">${General::swroot}/samba/global") or die "Can't save the global settings: $!"; - flock (FILE, 2); - -print FILE <${General::swroot}/samba/global") or die "Can't save the global settings: $!"; + flock (FILE, 2); + + print FILE < X-Patchwork-Id: 3580 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gWx470qz3x1S for ; Tue, 13 Oct 2020 16:11:09 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT554Yzz1WT; Tue, 13 Oct 2020 16:08:41 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gT54VjCz2xZt; Tue, 13 Oct 2020 16:08:41 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gT44VZjz2xBf for ; Tue, 13 Oct 2020 16:08:40 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSz4rP1z1TF; Tue, 13 Oct 2020 16:08:35 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tttyjUvlPU0KjCjSIXGCGohmNtROv2iiPi7EkC3GVSw=; b=E3fpEW+PuFw4gov/36YjlZqax++uNXRZ5T1INMHdcpM17BLuwPjm4lrc1AwMPcMd8APHIS f6T+JO5/JQttbEAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tttyjUvlPU0KjCjSIXGCGohmNtROv2iiPi7EkC3GVSw=; b=ANnPhZaGAv8gkFYgCdK9gGQP/6rmJwzteRvy7ksNhOwI738lel1eUffseKnm9spw/P6NFF Ap+x+RIsKtKhe1TU3na77pavesQlJGKtEFadLrHphYotbDp8pfgUpulBMO0n4IqnvCZ5PP CFcjodZHc4nI+QPnLQGsgJPa/M2XdCIK7QAvFfT4Z31/uEerZdhbptk41KRLUj6xQaHU9i dfC3Ri4NR4axVD5nTjLfYYYTHf1kvqtVulJHJkNWjResHEYj5V5FOAeQUAWCy/pRSCmPBL 7ML8tirAnMzc3MUm02VHWnx0P3CIVsuYLrVGvZaGVQCQONc2URVV8D695GDZcA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 54/54] samba: Bump package version Date: Tue, 13 Oct 2020 16:08:12 +0000 Message-Id: <20201013160812.27754-54-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/samba | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/samba b/lfs/samba index 38957cec9..15f9d10d2 100644 --- a/lfs/samba +++ b/lfs/samba @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 70 +PAK_VER = 71 DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp
From patchwork Tue Oct 13 16:08:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3575 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gWT2khtz3x3M for ; Tue, 13 Oct 2020 16:10:45 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT23ybvz1Vh; Tue, 13 Oct 2020 16:08:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gT00500z3052; Tue, 13 Oct 2020 16:08:36 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSy0c3Jz2xBM for ; Tue, 13 Oct 2020 16:08:34 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSw2bhKz1Hp; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jW2CUploaBJbtChvhGV7tc5g12icczxETfvyOIw9GU0=; b=r6qo9ZxZvD2OP5Oez3e+xYAuj0cCtbVQCfrtJF6UUD/6GPPfjoRgfbEwUedIw6Pj+Fz1hP yAZ3HnVOR0hx5hAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jW2CUploaBJbtChvhGV7tc5g12icczxETfvyOIw9GU0=; b=Z6Weu0/feOxhsAosY4tXJ/c16r1xFzE5eCvMswM+k0FEbZRMgEuh6B3sMz9vGPi3jyG3My 5LnJAe7oEYccg08K1B+xrcel7UCQoFuY3qINCyGe8JGntpOL/T/mcOayosROTL4hMHTFaj EH8trESCxryPW5M2v3VdU/ZYPBo7jtKyNnTtSM68L4FeZfBoxV4dD1qCCMHlJ0duGK8zr9 QQsebVpVyTurQ0QHd+y/JWWXsJIzYMH9L0aU8W0Kf8uvn8gDnl8aPojZrKSzMwBaIrE8lz TZh1SOo/k3oJ1kvgL8mj4/AaP6heMddk0oqga5CBXeKivcSSUqAQ4Ahxnfi6lA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 49/54] samba: Set a useful default workgroup Date: Tue, 13 Oct 2020 16:08:07 +0000 Message-Id: <20201013160812.27754-49-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 1504b8d3e..3f2903132 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -58,7 +58,7 @@ my %shares = (); ############################################################################################################################ #################################### Initialisierung von Samba Variablen fr global Settings ############################### -$sambasettings{'WORKGRP'} = 'homeip.net'; +$sambasettings{'WORKGRP'} = uc($mainsettings{'DOMAINNAME'}); $sambasettings{'INTERFACES'} = ''; $sambasettings{'ROLE'} = 'standalone'; $sambasettings{'REMOTEANNOUNCE'} = ''; From patchwork Tue Oct 13 16:08:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3577 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gWf32Gyz3x1S for ; Tue, 13 Oct 2020 16:10:54 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT24F34z1Vm; Tue, 13 Oct 2020 16:08:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gT00hj6z304W; Tue, 13 Oct 2020 16:08:36 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSy4rQmz2xBM for ; Tue, 13 Oct 2020 16:08:34 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSw4PDPz1KW; Tue, 13 Oct 2020 16:08:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZQFmeuk5a+LcKMPcOngxzHmsWbmFIhG8WXbNRJWGACQ=; b=XdH/Qf8cjDYveHrcJdShcvLcduOSKxeBbaFtqUgc9uwCoS8L3Ea6IiEQvuNjON2edu6+rg 1QnHgBlAEE0g+Dv/Gj/KSSv8WDVUqPV0Y9gQIEZGv3KTVxb5BOrH6aSjzhbwIRw3hX9J7s LMjrib2SqyjqKe+eUhDpZ/C/CNNDXZSQEiniEudQbYQpnIoRRap8n9AzK1ueB/P+WQpgq+ YmJTlzDUJjZ4tQlsosghZOE6ComCnneDJktg3JUXsn0uxmslC7chtx0OQeCoaRT5IKXSqN FTbl8o7GS3Yu0YpBkVn22lxj9jNVMQjG95H2l65YsLREpBQbj8U9/Ql1LgG2Yw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZQFmeuk5a+LcKMPcOngxzHmsWbmFIhG8WXbNRJWGACQ=; b=sVNTlY/4NCtRqWiyOT4Hz402Y83aqkr3PFbMIeTBDfwl5DLvQnK8EK4pPaNpGvTw8zB5sW mgxWxS7AdLxstYBA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 50/54] samba: Refactor user management Date: Tue, 13 Oct 2020 16:08:08 +0000 Message-Id: <20201013160812.27754-50-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- doc/language_issues.de | 9 +- doc/language_issues.en | 9 +- doc/language_issues.es | 9 +- doc/language_issues.fr | 9 +- doc/language_issues.it | 9 +- doc/language_issues.nl | 9 +- doc/language_issues.pl | 9 +- doc/language_issues.ru | 9 +- doc/language_issues.tr | 9 +- doc/language_missings | 8 ++ html/cgi-bin/samba.cgi | 276 ++++++++++++++++++++----------------- langs/en/cgi-bin/en.pl | 1 + src/misc-progs/sambactrl.c | 10 -- 13 files changed, 220 insertions(+), 156 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 771e9621a..6fcafc460 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -35,9 +35,11 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose WARNING: translation string unused: access allowed WARNING: translation string unused: access refused with this oinkcode +WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user +WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -148,6 +150,7 @@ WARNING: translation string unused: check for net traffic update WARNING: translation string unused: choose config WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: client WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect @@ -382,6 +385,7 @@ WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in +WARNING: translation string unused: inactive WARNING: translation string unused: incorrect password WARNING: translation string unused: info WARNING: translation string unused: insert floppy @@ -513,6 +517,7 @@ WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname WARNING: translation string unused: noservicename +WARNING: translation string unused: not set WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en @@ -589,6 +594,7 @@ WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory WARNING: translation string unused: pc +WARNING: translation string unused: pc add WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry @@ -659,6 +665,7 @@ WARNING: translation string unused: service removed WARNING: translation string unused: service updated WARNING: translation string unused: servicename WARNING: translation string unused: services settings +WARNING: translation string unused: set WARNING: translation string unused: shaping list options WARNING: translation string unused: show last x lines WARNING: translation string unused: show share options @@ -879,5 +886,5 @@ 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 +WARNING: untranslated string: user management = User Management WARNING: untranslated string: winbind daemon = Winbind Daemon diff --git a/doc/language_issues.en b/doc/language_issues.en index abba7016d..63106d66b 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -92,11 +92,9 @@ WARNING: untranslated string: a ca certificate with this name already exists = A WARNING: untranslated string: a connection with this common name already exists = A connection with this common name already exists. WARNING: untranslated string: a connection with this name already exists = A connection with this name already exists. WARNING: untranslated string: abort = abort -WARNING: untranslated string: accounting = Accounting WARNING: untranslated string: acpitemp = ACPI - Temperatures WARNING: untranslated string: action = Action WARNING: untranslated string: activate = Activate -WARNING: untranslated string: active = Active WARNING: untranslated string: add = Add WARNING: untranslated string: add a host = Add a host WARNING: untranslated string: add device = Add device @@ -465,7 +463,6 @@ WARNING: untranslated string: clear playlist = Empty playlist WARNING: untranslated string: clenabled = Provide time to local network WARNING: untranslated string: click to disable = Enabled (click to disable) WARNING: untranslated string: click to enable = Disabled (click to enable) -WARNING: untranslated string: client = Workstation Name WARNING: untranslated string: clock has not been synchronized = Clock has not been synchronized WARNING: untranslated string: clock last synchronized at = Clock was last synchronized at WARNING: untranslated string: common name = Common name @@ -1045,7 +1042,6 @@ WARNING: untranslated string: ignore filter = Ignore filter WARNING: untranslated string: ike lifetime should be between 1 and 24 hours = IKE lifetime should be between 1 and 24 hours. WARNING: untranslated string: imei = IMEI WARNING: untranslated string: imsi = IMSI -WARNING: untranslated string: inactive = inactive WARNING: untranslated string: include logfiles = Include logfiles WARNING: untranslated string: incoming = incoming WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression @@ -1323,7 +1319,6 @@ WARNING: untranslated string: not affected = Not Affected WARNING: untranslated string: not enough disk space = Not enough disk space WARNING: untranslated string: not present = Not present WARNING: untranslated string: not running = not running -WARNING: untranslated string: not set = not set WARNING: untranslated string: not validating = Not validating WARNING: untranslated string: notice = Notice WARNING: untranslated string: november = November @@ -1444,7 +1439,6 @@ WARNING: untranslated string: password = Password: WARNING: untranslated string: password not set = Password not set. WARNING: untranslated string: password too short = Password is too short. WARNING: untranslated string: passwords do not match = Passwords do not match. -WARNING: untranslated string: pc add = Add workstation WARNING: untranslated string: percentage = Percentage WARNING: untranslated string: persistent = Persistent WARNING: untranslated string: pfs yes no = Perfect Forward Secrecy (PFS) @@ -1571,7 +1565,6 @@ WARNING: untranslated string: server restart = You are not able to save any chan WARNING: untranslated string: service = Service WARNING: untranslated string: service name = Service name: WARNING: untranslated string: services = Services -WARNING: untranslated string: set = set WARNING: untranslated string: set time now = Set time now WARNING: untranslated string: set time now help = To queue a synchronization event at any time (even while using a repeating schedule), press the Set time now button. Please note that you may have to wait for five minutes, or more, before a sync event occurs. WARNING: untranslated string: settings = Settings @@ -2036,7 +2029,7 @@ WARNING: untranslated string: used memory = Used Memory WARNING: untranslated string: used swap = Used Swap WARNING: untranslated string: user = User WARNING: untranslated string: user log = user log -WARNING: untranslated string: user management = unknown string +WARNING: untranslated string: user management = User Management WARNING: untranslated string: user proxy logs = user proxy log WARNING: untranslated string: username = Username: WARNING: untranslated string: username not set = Username not set. diff --git a/doc/language_issues.es b/doc/language_issues.es index d0e540674..689eeca7c 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -14,9 +14,11 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose WARNING: translation string unused: access allowed WARNING: translation string unused: access refused with this oinkcode +WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user +WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -137,6 +139,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: client WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect @@ -332,6 +335,7 @@ WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in +WARNING: translation string unused: inactive WARNING: translation string unused: incorrect password WARNING: translation string unused: info WARNING: translation string unused: insert floppy @@ -460,6 +464,7 @@ WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname WARNING: translation string unused: noservicename +WARNING: translation string unused: not set WARNING: translation string unused: notes WARNING: translation string unused: o-no WARNING: translation string unused: o-yes @@ -513,6 +518,7 @@ WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory WARNING: translation string unused: pc +WARNING: translation string unused: pc add WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry @@ -583,6 +589,7 @@ WARNING: translation string unused: service removed WARNING: translation string unused: service updated WARNING: translation string unused: servicename WARNING: translation string unused: services settings +WARNING: translation string unused: set WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas @@ -1437,7 +1444,7 @@ WARNING: untranslated string: uplink bit rate = Uplink Bit Rate WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters WARNING: untranslated string: uptime load average = Load average WARNING: untranslated string: urlfilter redirect template = Redirect page template -WARNING: untranslated string: user management = unknown string +WARNING: untranslated string: user management = User Management WARNING: untranslated string: vendor = Vendor WARNING: untranslated string: visit us at = Visit us at WARNING: untranslated string: vpn broken = Broken diff --git a/doc/language_issues.fr b/doc/language_issues.fr index effe54ab2..632acf938 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -39,9 +39,11 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose WARNING: translation string unused: access allowed WARNING: translation string unused: access refused with this oinkcode +WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user +WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -169,6 +171,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: client WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect @@ -410,6 +413,7 @@ WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in +WARNING: translation string unused: inactive WARNING: translation string unused: incorrect password WARNING: translation string unused: info WARNING: translation string unused: insert floppy @@ -542,6 +546,7 @@ WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname WARNING: translation string unused: noservicename +WARNING: translation string unused: not set WARNING: translation string unused: notes WARNING: translation string unused: o-no WARNING: translation string unused: o-yes @@ -620,6 +625,7 @@ WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory WARNING: translation string unused: pc +WARNING: translation string unused: pc add WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry @@ -691,6 +697,7 @@ WARNING: translation string unused: service removed WARNING: translation string unused: service updated WARNING: translation string unused: servicename WARNING: translation string unused: services settings +WARNING: translation string unused: set WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas @@ -916,5 +923,5 @@ 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: user management = User Management WARNING: untranslated string: winbind daemon = Winbind Daemon diff --git a/doc/language_issues.it b/doc/language_issues.it index cbd9ef611..99a7f3e8d 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -15,9 +15,11 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose WARNING: translation string unused: access allowed WARNING: translation string unused: access refused with this oinkcode +WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user +WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -145,6 +147,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: client WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect @@ -389,6 +392,7 @@ WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in +WARNING: translation string unused: inactive WARNING: translation string unused: incorrect password WARNING: translation string unused: info WARNING: translation string unused: insert floppy @@ -517,6 +521,7 @@ WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname WARNING: translation string unused: noservicename +WARNING: translation string unused: not set WARNING: translation string unused: notes WARNING: translation string unused: o-no WARNING: translation string unused: o-yes @@ -594,6 +599,7 @@ WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory WARNING: translation string unused: pc +WARNING: translation string unused: pc add WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry @@ -664,6 +670,7 @@ WARNING: translation string unused: service removed WARNING: translation string unused: service updated WARNING: translation string unused: servicename WARNING: translation string unused: services settings +WARNING: translation string unused: set WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas @@ -1149,7 +1156,7 @@ WARNING: untranslated string: uncheck all = Uncheck all WARNING: untranslated string: unlimited = Unlimited WARNING: untranslated string: update ruleset = Update ruleset WARNING: untranslated string: uplink bit rate = Uplink Bit Rate -WARNING: untranslated string: user management = unknown string +WARNING: untranslated string: user management = User Management WARNING: untranslated string: vpn broken = Broken WARNING: untranslated string: vpn connecting = CONNECTING WARNING: untranslated string: vpn force mobike = Force using MOBIKE (only IKEv2) diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 94723dad5..2afa7b0f3 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -15,9 +15,11 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose WARNING: translation string unused: access allowed WARNING: translation string unused: access refused with this oinkcode +WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user +WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -144,6 +146,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: client WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect @@ -385,6 +388,7 @@ WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in +WARNING: translation string unused: inactive WARNING: translation string unused: incorrect password WARNING: translation string unused: info WARNING: translation string unused: insert floppy @@ -512,6 +516,7 @@ WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname WARNING: translation string unused: noservicename +WARNING: translation string unused: not set WARNING: translation string unused: notes WARNING: translation string unused: o-no WARNING: translation string unused: o-yes @@ -587,6 +592,7 @@ WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory WARNING: translation string unused: pc +WARNING: translation string unused: pc add WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry @@ -657,6 +663,7 @@ WARNING: translation string unused: service removed WARNING: translation string unused: service updated WARNING: translation string unused: servicename WARNING: translation string unused: services settings +WARNING: translation string unused: set WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas @@ -1188,7 +1195,7 @@ WARNING: untranslated string: unlimited = Unlimited WARNING: untranslated string: update ruleset = Update ruleset WARNING: untranslated string: uplink bit rate = Uplink Bit Rate WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters -WARNING: untranslated string: user management = unknown string +WARNING: untranslated string: user management = User Management WARNING: untranslated string: vendor = Vendor WARNING: untranslated string: vpn broken = Broken WARNING: untranslated string: vpn connecting = CONNECTING diff --git a/doc/language_issues.pl b/doc/language_issues.pl index d0e540674..689eeca7c 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -14,9 +14,11 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose WARNING: translation string unused: access allowed WARNING: translation string unused: access refused with this oinkcode +WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user +WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -137,6 +139,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: client WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect @@ -332,6 +335,7 @@ WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in +WARNING: translation string unused: inactive WARNING: translation string unused: incorrect password WARNING: translation string unused: info WARNING: translation string unused: insert floppy @@ -460,6 +464,7 @@ WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname WARNING: translation string unused: noservicename +WARNING: translation string unused: not set WARNING: translation string unused: notes WARNING: translation string unused: o-no WARNING: translation string unused: o-yes @@ -513,6 +518,7 @@ WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory WARNING: translation string unused: pc +WARNING: translation string unused: pc add WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry @@ -583,6 +589,7 @@ WARNING: translation string unused: service removed WARNING: translation string unused: service updated WARNING: translation string unused: servicename WARNING: translation string unused: services settings +WARNING: translation string unused: set WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas @@ -1437,7 +1444,7 @@ WARNING: untranslated string: uplink bit rate = Uplink Bit Rate WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters WARNING: untranslated string: uptime load average = Load average WARNING: untranslated string: urlfilter redirect template = Redirect page template -WARNING: untranslated string: user management = unknown string +WARNING: untranslated string: user management = User Management WARNING: untranslated string: vendor = Vendor WARNING: untranslated string: visit us at = Visit us at WARNING: untranslated string: vpn broken = Broken diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 8a296ff3d..ac9715beb 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -15,9 +15,11 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose WARNING: translation string unused: access allowed WARNING: translation string unused: access refused with this oinkcode +WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user +WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -138,6 +140,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: client WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect @@ -328,6 +331,7 @@ WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in +WARNING: translation string unused: inactive WARNING: translation string unused: incorrect password WARNING: translation string unused: info WARNING: translation string unused: insert floppy @@ -452,6 +456,7 @@ WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname WARNING: translation string unused: noservicename +WARNING: translation string unused: not set WARNING: translation string unused: notes WARNING: translation string unused: o-no WARNING: translation string unused: o-yes @@ -516,6 +521,7 @@ WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory WARNING: translation string unused: pc +WARNING: translation string unused: pc add WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry @@ -586,6 +592,7 @@ WARNING: translation string unused: service removed WARNING: translation string unused: service updated WARNING: translation string unused: servicename WARNING: translation string unused: services settings +WARNING: translation string unused: set WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas @@ -1432,7 +1439,7 @@ WARNING: untranslated string: uplink bit rate = Uplink Bit Rate WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters WARNING: untranslated string: uptime load average = Load average WARNING: untranslated string: urlfilter redirect template = Redirect page template -WARNING: untranslated string: user management = unknown string +WARNING: untranslated string: user management = User Management WARNING: untranslated string: vendor = Vendor WARNING: untranslated string: visit us at = Visit us at WARNING: untranslated string: vpn broken = Broken diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 1cbcdd70c..7613e2ff7 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -36,9 +36,11 @@ WARNING: translation string unused: TOS Bits WARNING: translation string unused: Verbose WARNING: translation string unused: access allowed WARNING: translation string unused: access refused with this oinkcode +WARNING: translation string unused: accounting WARNING: translation string unused: accounting user nonpdc WARNING: translation string unused: accounting user pdc WARNING: translation string unused: activate user +WARNING: translation string unused: active WARNING: translation string unused: add a new rule WARNING: translation string unused: add cron WARNING: translation string unused: add network @@ -167,6 +169,7 @@ WARNING: translation string unused: choose config WARNING: translation string unused: choose media WARNING: translation string unused: class in use WARNING: translation string unused: clear cache +WARNING: translation string unused: client WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect @@ -414,6 +417,7 @@ WARNING: translation string unused: ike lifetime WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in +WARNING: translation string unused: inactive WARNING: translation string unused: incorrect password WARNING: translation string unused: info WARNING: translation string unused: insert floppy @@ -545,6 +549,7 @@ WARNING: translation string unused: no modem selected WARNING: translation string unused: no set selected WARNING: translation string unused: nonetworkname WARNING: translation string unused: noservicename +WARNING: translation string unused: not set WARNING: translation string unused: notes WARNING: translation string unused: o-no WARNING: translation string unused: o-yes @@ -622,6 +627,7 @@ WARNING: translation string unused: password crypting key WARNING: translation string unused: passwords must be at least 6 characters in length WARNING: translation string unused: path to directory WARNING: translation string unused: pc +WARNING: translation string unused: pc add WARNING: translation string unused: pdc options WARNING: translation string unused: phase1 group WARNING: translation string unused: phonebook entry @@ -692,6 +698,7 @@ WARNING: translation string unused: service removed WARNING: translation string unused: service updated WARNING: translation string unused: servicename WARNING: translation string unused: services settings +WARNING: translation string unused: set WARNING: translation string unused: shaping add options WARNING: translation string unused: shaping list options WARNING: translation string unused: show areas @@ -1040,7 +1047,7 @@ WARNING: untranslated string: system is offline = The system is offline. WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2 WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: update ruleset = Update ruleset -WARNING: untranslated string: user management = unknown string +WARNING: untranslated string: user management = User Management WARNING: untranslated string: vpn start action add = Wait for connection initiation WARNING: untranslated string: vpn statistics n2n = unknown string WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy. diff --git a/doc/language_missings b/doc/language_missings index 0934f8431..a1fcdc334 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -58,6 +58,7 @@ < tor errmsg invalid node id < updxlrtr used by < upload fcdsl.o +< user management < vpn configuration main < winbind daemon ############################################################################ @@ -844,6 +845,7 @@ < uptime < uptime load average < urlfilter redirect template +< user management < vendor < visit us at < vpn broken @@ -954,6 +956,7 @@ < samba server role standalone < smb daemon < upload fcdsl.o +< user management < winbind daemon ############################################################################ # Checking cgi-bin translations for language: it # @@ -1263,6 +1266,7 @@ < unlimited < update ruleset < uplink bit rate +< user management < vpn broken < vpn connecting < vpn force mobike @@ -1684,6 +1688,7 @@ < update ruleset < uplink bit rate < upload dh key +< user management < vendor < vpn broken < vpn connecting @@ -2512,6 +2517,7 @@ < uptime < uptime load average < urlfilter redirect template +< user management < vendor < visit us at < vpn broken @@ -3379,6 +3385,7 @@ < uptime < uptime load average < urlfilter redirect template +< user management < vendor < visit us at < vpn broken @@ -3615,6 +3622,7 @@ < taa zombieload2 < transport mode does not support vti < update ruleset +< user management < vpn start action add < vpn subjectaltname missing < vpn wait diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 3f2903132..cad8ebd3b 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -84,7 +84,6 @@ my $LOGLINES = '50'; if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system("/usr/local/bin/sambactrl smbuserdisable $sambasettings{'NAME'}");} if ($sambasettings{'ACTION'} eq 'smbuserenable'){system("/usr/local/bin/sambactrl smbuserenable $sambasettings{'NAME'}");} if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");} -if ($sambasettings{'ACTION'} eq 'smbpcadd'){system("/usr/local/bin/sambactrl smbpcadd $sambasettings{'PCNAME'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");} if ($sambasettings{'ACTION'} eq 'smbchangepw'){system("/usr/local/bin/sambactrl smbchangepw $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");} if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl smbrestart");} if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");} @@ -360,170 +359,187 @@ END if ($sambasettings{'ROLE'} eq 'standalone') { &Header::openbox('100%', 'center', $Lang::tr{'user management'}); - print < - - - - + + print < + + + + END -; - print ""; - print ""; system('/usr/local/bin/sambactrl readsmbpasswd'); open(FILE, "<${General::swroot}/samba/private/smbpasswd") or die "Can't read user file: $!"; - @user = ; + my @users = ; close(FILE); system('/usr/local/bin/sambactrl locksmbpasswd'); - + my $lines = 0; - - foreach $userentry (sort @user) - { - @userline = split( /\:/, $userentry ); - if ($lines % 2) {print "";} else {print "";} - print ""; + } else { + print ""; + } - if ($userline[4] =~ /D/) - { - print < - + # Print username + print ""; + + if ($userline[4] =~ /D/) { + print < +
+ + + + + END -; - } - else - { - print < - + } else { + print < +
+ + + + + END -; - } + } - if ($userline[0] =~ /\$/) - { + # Machine accounts can't be edited + if ($userline[0] =~ /\$/) { print ""; - } - else - { - print <
- - - - + } else { + print < +
+ + + + + END -; - } + } - print <
+ print < + - + + + END -; $lines++; - } - print < -
-
$Lang::tr{'accounting'}
$Lang::tr{'username'}$Lang::tr{'password'}
$Lang::tr{'user'}
$Lang::tr{'status'}$Lang::tr{'options'}
$userline[0]"; - if ($userline[4] =~ /N/) - { - print "$Lang::tr{'not set'}"; - } - else - { - print "$Lang::tr{'set'}"; - } + foreach $userentry (sort @users) { + @userline = split( /\:/, $userentry); - print ""; + if ($lines % 2) { + print "
- - - - $userline[0]
- - - -
- - -
- -
+ } + + print < + +
+ + + + + +
+
+ + +
+
END -; - if ($sambasettings{'ACTION'} eq 'userchangepw') - { - my $username = "$sambasettings{'NAME'}"; + if ($sambasettings{'ACTION'} eq 'userchangepw') { + my $username = $sambasettings{'NAME'}; my $password = 'samba'; + print < -
- - - - - -
$Lang::tr{'change passwords'}
$Lang::tr{'username'}
$Lang::tr{'password'}
-
-
+
+
+ + + + + + + + + + + + + + + +
$Lang::tr{'change passwords'}
$Lang::tr{'username'} + +
$Lang::tr{'password'} + +
+ + +
+
END -; - } + } - if ($sambasettings{'ACTION'} eq 'useradd') - { + if ($sambasettings{'ACTION'} eq 'useradd') { my $username = "user"; my $password = "samba"; chomp $username; $username=~s/\s//g; chomp $password; $password=~s/\s//g; - print < -
- - - - - - - -
$Lang::tr{'add user'}
$Lang::tr{'username'}
$Lang::tr{'password'}
$Lang::tr{'unix group'}
$Lang::tr{'unix shell'}
-
-
-END -; - } - if ($sambasettings{'ACTION'} eq 'pcadd') - { - my $pcname = "client\$"; - chomp $pcname; - $pcname=~s/\s//g; - print < -
- - - - - - -
$Lang::tr{'pc add'}
$Lang::tr{'client'}
$Lang::tr{'unix group'}
$Lang::tr{'unix shell'}
-
-
+ print < + +
+ + + + + + + + + + + + + + + + + + + + + + + +
$Lang::tr{'add user'}
$Lang::tr{'username'} + +
$Lang::tr{'password'} + +
$Lang::tr{'unix group'} + +
$Lang::tr{'unix shell'} + +
+ + +
+
END -; - } + } -&Header::closebox(); + &Header::closebox(); } if ($sambasettings{'ROLE'} eq "member") { diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a0419c02d..0b4f098a7 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2834,6 +2834,7 @@ 'used swap' => 'Used Swap', 'user' => 'User', 'user log' => 'user log', +'user management' => 'User Management', 'user proxy logs' => 'user proxy log', 'username' => 'Username:', 'username not set' => 'Username not set.', diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c index 1dcc8ee61..91761a422 100644 --- a/src/misc-progs/sambactrl.c +++ b/src/misc-progs/sambactrl.c @@ -71,16 +71,6 @@ int main(int argc, char *argv[]) { snprintf(command, BUFFER_SIZE-1, "/usr/bin/printf '%s\n%s\n' | /usr/bin/smbpasswd -as %s >/dev/null", argv[3], argv[3], argv[2]); safe_system(command); - } else if (strcmp(argv[1], "smbpcadd") == 0) { - snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambawks >/dev/null"); - safe_system(command); - - snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba Workstation' -g %s -s %s %s >/dev/null", argv[3], argv[4], argv[2]); - safe_system(command); - - snprintf(command, BUFFER_SIZE-1, "/usr/bin/smbpasswd -a -m %s >/dev/null", argv[2]); - safe_system(command); - } else if (strcmp(argv[1], "smbchangepw") == 0) { snprintf(command, BUFFER_SIZE-1, "echo %s:%s | chpasswd", argv[2], argv[3]); safe_system(command); From patchwork Tue Oct 13 16:08:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3574 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gWS6WD3z3x1S for ; Tue, 13 Oct 2020 16:10:44 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gT26yPVz1Vr; Tue, 13 Oct 2020 16:08:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gT01PTBz3056; Tue, 13 Oct 2020 16:08:36 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSy6k5yz2xBM for ; Tue, 13 Oct 2020 16:08:34 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSx6CHJz1GD; Tue, 13 Oct 2020 16:08:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GoyuCU1n8bawYGWlc8/9483ZHuBdHmtDFa5vSKucJ64=; b=KWJZjfjdiE9j4hPJpDIbaVgGHOQdkyUHiuKFmWyvJEk973ZsjH3R6FRohkKoSlHFsKVpI1 EwJB5ETYKIk+02PqsmOuIFZ93arylxWMT++Pr0HDRK8bLSW6gUJMszsspVUPVY+Xz0S85E 5NkYqu1qF+SoFlcKLXxfidWtIALlE+VpOdSOi2k6EADqs1jCGpYPph9hVYGn6s9kGRmZAo Xd53hNEv+LcODbdQe5zQebuK1ACvdmji93BBuVIQ6pb77P1Ly2ZRUnBZY1ai51R72JRPSq f8nY1xazAQ2AmBqWPzxR7pBXZpYp+fBVSIBzlc9I35j3QIH+XXUiieYO1zZIOA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GoyuCU1n8bawYGWlc8/9483ZHuBdHmtDFa5vSKucJ64=; b=/PHXF1oFQtQVFjcp2NSSfAjqCYGgpRMLOFYcPCUmXgis4y7DXf0Z84vM1Df3+shUmcyl+e +Cr8PeaiLk00zbBw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 51/54] samba: Use the same delete icon as everywhere else Date: Tue, 13 Oct 2020 16:08:09 +0000 Message-Id: <20201013160812.27754-51-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- html/cgi-bin/samba.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index cad8ebd3b..deb79b9c8 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -429,7 +429,7 @@ END
- +