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 |