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