samba: Drop netbios name option

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / samba.cgi

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 72bf8c469b3120b82741bb43977cbbc0465a2241..0beb24241d474bccbd65ebc8424357bc8ae5dc4e 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -42,7 +42,7 @@ my @Logs = qx(ls /var/log/samba/);
 my $Log =$Lang::tr{'no log selected'};
 
 my $Status = qx(/usr/local/bin/sambactrl smbstatus);
-$Status=~s/\n/<br \/>/g;
+$Status = &Header::cleanhtml($Status);
 
 my $userentry = "";
 my @user = ();
@@ -75,8 +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{'SRVSTRING'} = 'Samba running on IPFire 2.x';
 $sambasettings{'INTERFACES'} = '';
 $sambasettings{'SECURITY'} = 'user';
 $sambasettings{'OSLEVEL'} = '33';
@@ -93,8 +91,6 @@ $sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
 $sambasettings{'GUESTACCOUNT'} = 'samba';
 $sambasettings{'MAPTOGUEST'} = 'Bad User';
 $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2';
-$sambasettings{'DOSCHARSET'} = 'CP850';
-$sambasettings{'UNIXCHARSET'} = 'UTF8';
 $sambasettings{'WIDELINKS'} = 'on';
 $sambasettings{'UNIXEXTENSION'} = 'off';
 $sambasettings{'SMB2'} = 'on';
@@ -143,8 +139,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';
@@ -161,8 +155,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
        $sambasettings{'GUESTACCOUNT'} = 'samba';
        $sambasettings{'MAPTOGUEST'} = 'Bad User';
        $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2';
-       $sambasettings{'DOSCHARSET'} = 'CP850';
-       $sambasettings{'UNIXCHARSET'} = 'UTF8';
 ### Samba CUPS Variablen
        $sambasettings{'LOADPRINTERS'} = 'Yes';
        $sambasettings{'PRINTING'} = 'cups';
@@ -267,8 +259,8 @@ print FILE <<END
 # global.settings by IPFire Project
 
 [global]
-netbios name = $sambasettings{'NETBIOSNAME'}
-server string = $sambasettings{'SRVSTRING'}
+server string = Samba on IPFire
+
 workgroup = $sambasettings{'WORKGRP'}
 realm = $mainsettings{'DOMAINNAME'}
 passdb backend = smbpasswd
@@ -283,28 +275,19 @@ if ($sambasettings{'SMB2'} eq 'on'){
 }
 
 print FILE <<END
-keep alive = 30
 os level = $sambasettings{'OSLEVEL'}
-fstype = NTFS
 
-kernel oplocks = false
 map to guest = $sambasettings{'MAPTOGUEST'}
-smb ports = 445 139
-dos charset = $sambasettings{'DOSCHARSET'}
-unix charset = $sambasettings{'UNIXCHARSET'}
 
 security = $sambasettings{'SECURITY'}
-encrypt passwords = yes
 guest account = $sambasettings{'GUESTACCOUNT'}
 unix password sync = $sambasettings{'PASSWORDSYNC'}
-null passwords = yes
 
 bind interfaces only = true
 interfaces = $sambasettings{'INTERFACES'}
 remote announce = $sambasettings{'REMOTEANNOUNCE'}
 remote browse sync = $sambasettings{'REMOTESYNC'}
 
-username level = 1
 wins support = $sambasettings{'WINSSUPPORT'}
 wins server = $sambasettings{'WINSSRV'}
 
@@ -313,8 +296,7 @@ winbind uid = 10000-20000
 winbind gid = 10000-20000
 winbind use default domain = yes
 
-log file       = /var/log/samba/samba-log.%m
-pid directory  = /var/run/
+log file  = /var/log/samba/samba-log.%m
 log level = $sambasettings{'LOGLEVEL'}
 
 preferred master = $sambasettings{'PREFERREDMASTER'}
@@ -469,10 +451,6 @@ print <<END
 <table width='95%' cellspacing='0'>
 <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{'dos charset'}</td><td align='left'><input type='text' name='DOSCHARSET' value='$sambasettings{'DOSCHARSET'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'unix charset'}</td><td align='left'><input type='text' name='UNIXCHARSET' value='$sambasettings{'UNIXCHARSET'}' 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 |
@@ -1195,7 +1173,7 @@ print <<END
 <br />
 <table width='95%' cellspacing='0'>
 <tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'samba status'}</b></td></tr>
-<tr><td  align='left'>$Status</td></tr>
+<tr><td  align='left'><small><pre>$Status</pre></small></td></tr>
 </table>
 END
 ;