From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 12/54] samba: Hard-code server string
Date: Tue, 13 Oct 2020 16:07:30 +0000 [thread overview]
Message-ID: <20201013160812.27754-12-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 2504 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
html/cgi-bin/samba.cgi | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index a36f34272..5a97b291d 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -76,7 +76,6 @@ my %servicenames = ('SMB Daemon' => 'smbd', 'NetBIOS Nameserver' => 'nmbd', 'Win
$sambasettings{'WORKGRP'} = 'homeip.net';
$sambasettings{'NETBIOSNAME'} = 'IPFire';
-$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x';
$sambasettings{'INTERFACES'} = '';
$sambasettings{'SECURITY'} = 'user';
$sambasettings{'OSLEVEL'} = '33';
@@ -142,7 +141,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
system("/usr/local/bin/sambactrl smbglobalreset");
$sambasettings{'WORKGRP'} = 'homeip.net';
$sambasettings{'NETBIOSNAME'} = 'IPFire';
- $sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x';
$sambasettings{'INTERFACES'} = '';
$sambasettings{'SECURITY'} = 'user';
$sambasettings{'OSLEVEL'} = '65';
@@ -263,8 +261,9 @@ print FILE <<END
# global.settings by IPFire Project
[global]
+server string = Samba on IPFire
+
netbios name = $sambasettings{'NETBIOSNAME'}
-server string = $sambasettings{'SRVSTRING'}
workgroup = $sambasettings{'WORKGRP'}
realm = $mainsettings{'DOMAINNAME'}
passdb backend = smbpasswd
@@ -456,7 +455,6 @@ print <<END
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'workgroup'}</td><td align='left'><input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'netbios name'}</td><td align='left'><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'server string'}</td><td align='left'><input type='text' name='SRVSTRING' value='$sambasettings{'SRVSTRING'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'log level'}</td><td align='left'><input type='text' name='LOGLEVEL' value='$sambasettings{'LOGLEVEL'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'interfaces'}</td><td align='left'>on <input type='radio' name='VPN' value='on' $checked{'VPN'}{'on'} />/
<input type='radio' name='VPN' value='off' $checked{'VPN'}{'off'} /> off |
--
2.20.1
next prev parent reply other threads:[~2020-10-13 16:07 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-13 16:07 [PATCH 01/54] samba: Migrate configuration from Samba 3.6 to 4.x Michael Tremer
2020-10-13 16:07 ` [PATCH 02/54] samba: Migrate older backups too and use standard update mechasism Michael Tremer
2020-10-13 16:07 ` [PATCH 03/54] samba: Remove deprecated syslog options Michael Tremer
2020-10-13 16:07 ` [PATCH 04/54] samba: Remove socket options Michael Tremer
2020-10-13 16:07 ` [PATCH 05/54] samba: Show status output in monospace font Michael Tremer
2020-10-13 16:07 ` [PATCH 06/54] samba: Correctly escape status output Michael Tremer
2020-10-13 16:07 ` [PATCH 07/54] samba: Update SECURITY option in settings, too Michael Tremer
2020-10-13 16:07 ` [PATCH 08/54] samba: Remove deprecated encrypt/null passwords options Michael Tremer
2020-10-13 16:07 ` [PATCH 09/54] samba: Remove any options left to default value in global section Michael Tremer
2020-10-13 16:07 ` [PATCH 10/54] sambactrl: Remove unused reset command Michael Tremer
2020-10-13 16:07 ` [PATCH 11/54] samba: Drop outdated character set settings Michael Tremer
2020-10-13 16:07 ` Michael Tremer [this message]
2020-10-13 16:07 ` [PATCH 13/54] samba: Drop netbios name option Michael Tremer
2020-10-13 16:07 ` [PATCH 14/54] samba: Remove limitation that server only uses SMB2 Michael Tremer
2020-10-13 16:07 ` [PATCH 15/54] samba: Drop support for WINS Michael Tremer
2020-10-13 16:07 ` [PATCH 16/54] samba: Log to syslog Michael Tremer
2020-10-13 16:07 ` [PATCH 17/54] samba: Remove reset options Michael Tremer
2020-10-13 16:07 ` [PATCH 18/54] samba: Remove help popup Michael Tremer
2020-10-13 16:07 ` [PATCH 19/54] samba: Always show printer options Michael Tremer
2020-10-13 16:07 ` [PATCH 20/54] samba: Remove printer management Michael Tremer
2020-10-13 16:07 ` [PATCH 21/54] samba: Export all printers from CUPS Michael Tremer
2020-10-13 16:07 ` [PATCH 22/54] samba: Add option to require clients to encrypt the connection Michael Tremer
2020-10-13 16:07 ` [PATCH 23/54] samba: Drop interfaces configuration Michael Tremer
2020-10-13 16:07 ` [PATCH 24/54] samba: Drop support for being PDC for Windows NT domains Michael Tremer
2020-10-13 16:07 ` [PATCH 25/54] samba: Remove local master option Michael Tremer
2020-10-13 16:07 ` [PATCH 26/54] samba: Remove preferred " Michael Tremer
2020-10-13 16:07 ` [PATCH 27/54] samba: Drop PDC default configuration Michael Tremer
2020-10-13 16:07 ` [PATCH 28/54] samba: Remove OS level Michael Tremer
2020-10-13 16:07 ` [PATCH 29/54] samba: Remove move unused network variables Michael Tremer
2020-10-13 16:07 ` [PATCH 30/54] samba: Remove un-exported password sync option Michael Tremer
2020-10-13 16:07 ` [PATCH 31/54] samba: Refactor service status Michael Tremer
2020-10-13 16:07 ` [PATCH 32/54] samba: Drop refresh page hack Michael Tremer
2020-10-13 16:07 ` [PATCH 33/54] samba: Add tbl class to all <table>s Michael Tremer
2020-10-13 16:07 ` [PATCH 34/54] samba: Replace icons on top of page with buttons Michael Tremer
2020-10-13 16:07 ` [PATCH 35/54] samba: Re-indent global settings table Michael Tremer
2020-10-13 16:07 ` [PATCH 36/54] samba: Replace save icon with a button and remove legend Michael Tremer
2020-10-13 16:07 ` [PATCH 37/54] samba: Remove more legends Michael Tremer
2020-10-13 16:07 ` [PATCH 38/54] samba: Remove unused anchors Michael Tremer
2020-10-13 16:07 ` [PATCH 39/54] samba: Refactor shares section Michael Tremer
2020-10-13 16:07 ` [PATCH 40/54] samba: Refactor status area Michael Tremer
2020-10-13 16:07 ` [PATCH 41/54] samba: Use full page width for all tables Michael Tremer
2020-10-13 16:08 ` [PATCH 42/54] samba: Enable support for Apple's OS X by default Michael Tremer
2020-10-13 16:08 ` [PATCH 43/54] samba: Drop choice to enable/disable wide links/UNIX extensions Michael Tremer
2020-10-13 16:08 ` [PATCH 44/54] samba: Add recycle extension, too Michael Tremer
2020-10-13 16:08 ` [PATCH 45/54] samba: Change share template to something more safe Michael Tremer
2020-10-13 16:08 ` [PATCH 46/54] samba: Replace security setting with server role Michael Tremer
2020-10-13 16:08 ` [PATCH 47/54] samba: Automatically migrate role setting Michael Tremer
2020-10-13 16:08 ` [PATCH 48/54] samba: Remove tbl class from join form Michael Tremer
2020-10-13 16:08 ` [PATCH 49/54] samba: Set a useful default workgroup Michael Tremer
2020-10-13 16:08 ` [PATCH 50/54] samba: Refactor user management Michael Tremer
2020-10-13 16:08 ` [PATCH 51/54] samba: Use the same delete icon as everywhere else Michael Tremer
2020-10-13 16:08 ` [PATCH 52/54] samba: Remove unused INTERFACES setting Michael Tremer
2020-10-13 16:08 ` [PATCH 53/54] samba: Allow rewriting configuration from CLI Michael Tremer
2020-10-13 16:08 ` [PATCH 54/54] samba: Bump package version Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201013160812.27754-12-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox