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");