From patchwork Mon Oct 5 20:17:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 3511 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 4C4sMq2f1vz3x0l for ; Mon, 5 Oct 2020 20:17: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 4C4sMm1RkYz1Fn; Mon, 5 Oct 2020 20:17:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C4sMl662rz303C; Mon, 5 Oct 2020 20:17: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 4C4sMk4zlXz2xb4 for ; Mon, 5 Oct 2020 20:17: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 4C4sMk3Fcqz1Ff; Mon, 5 Oct 2020 20:17:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1601929042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=1a0PWyMVXG9B46YYnoHZyFfsSxOTnjRZ/Qp9Bulz0Nk=; b=Kuk+lFA6X8K6sogR0U7VI8OjWGYLaX7N9r11x1qKSxYWXp4C5LGCTbUGk/NJQeOAlvWZPs bL2nvHIQh+EI7IOtYemz1wH+LTfGZUPQzQx92buID4bsn4dIZQm9nn+YOC5Qs4MetRziJ/ VngtRptce5MlxUUCixGIyqRrsOJCsu4x1UkQv40TV4H1FimFuRWg3u40TYqEQhEdB/Nerb 9ernBqQPWEOg80gOsbIpZ9s8n6EcXH9mkHqGQ4OFrjs9QzLxvj7jgoB0rVr7HcFKi1tBHS edY23AL3T7TsbaqVIUCCTVpohm8b4W0MvfCFDX2qPbrQAV8CejcFzKm2SrcZkQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1601929042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=1a0PWyMVXG9B46YYnoHZyFfsSxOTnjRZ/Qp9Bulz0Nk=; b=NmEAJUCk/WjL7Hdhgam2kFmQGgshUdc5q0axTlIgBLaWw8DhHIi1bENTydy2P36hYTzaPn 1F2i3E2B+2LhuMCQ== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH 2/9] samba.cgi: remove unsupported DISPLAY CHARSET Date: Mon, 5 Oct 2020 22:17:04 +0200 Message-Id: <20201005201711.4259-2-arne_f@ipfire.org> In-Reply-To: <20201005201711.4259-1-arne_f@ipfire.org> References: <20201005201711.4259-1-arne_f@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=arne_f@ipfire.org smtp.mailfrom=arne_f@ipfire.org 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: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Arne Fitzenreiter --- 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 8f88bc728..151283e7f 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -97,7 +97,6 @@ $sambasettings{'SYSLOGLEVEL'} = '1'; $sambasettings{'SYSLOGONLY'} = 'on'; $sambasettings{'DOSCHARSET'} = 'CP850'; $sambasettings{'UNIXCHARSET'} = 'UTF8'; -$sambasettings{'DISPLAYCHARSET'} = 'CP850'; $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; @@ -169,7 +168,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'SYSLOGONLY'} = 'on'; $sambasettings{'DOSCHARSET'} = 'CP850'; $sambasettings{'UNIXCHARSET'} = 'UTF8'; - $sambasettings{'DISPLAYCHARSET'} = 'CP850'; ### Samba CUPS Variablen $sambasettings{'LOADPRINTERS'} = 'Yes'; $sambasettings{'PRINTING'} = 'cups'; @@ -301,7 +299,6 @@ map to guest = $sambasettings{'MAPTOGUEST'} smb ports = 445 139 dos charset = $sambasettings{'DOSCHARSET'} unix charset = $sambasettings{'UNIXCHARSET'} -display charset = $sambasettings{'DISPLAYCHARSET'} security = $sambasettings{'SECURITY'} encrypt passwords = yes @@ -488,7 +485,6 @@ print <$Lang::tr{'netbios name'} $Lang::tr{'dos charset'} $Lang::tr{'unix charset'} -$Lang::tr{'display charset'} $Lang::tr{'server string'} $Lang::tr{'log level'} Sys$Lang::tr{'log level'}