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