samba: Log to syslog

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/152/filelists/files b/config/rootfiles/core/152/filelists/files
index ceb904c64ef6dca628b4cd85641846af2327c17b..aaf469bcea2228dabd25403d20c86491362341da 100644 (file)
--- a/config/rootfiles/core/152/filelists/files
+++ b/config/rootfiles/core/152/filelists/files
@@ -9,5 +9,6 @@ etc/rc.d/helper/oci-setup
 etc/rc.d/init.d/networking/any
 etc/rc.d/init.d/networking/red
 srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 usr/local/bin/setaliases
 var/ipfire/graphs.pl

diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index 630ec9da80673714293eecaf203fd4a445118b1f..a707895d99a8da2ab288f6ac2ead162f9e7ecd26 100644 (file)
--- a/config/rootfiles/packages/aarch64/samba
+++ b/config/rootfiles/packages/aarch64/samba
@@ -812,7 +812,6 @@ var/lib/samba
 var/lib/samba/bind-dns
 var/lib/samba/private
 var/lib/samba/winbindd_privileged
-var/log/samba
 var/nmbd
 srv/web/ipfire/cgi-bin/samba.cgi
 srv/web/ipfire/cgi-bin/sambahlp.cgi

diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba
index 51349093b8d2498f71f6fb9aa564fde6579cc64c..885d9e15456ee9f0ad42bd24f8a48bfd21377bc9 100644 (file)
--- a/config/rootfiles/packages/armv5tel/samba
+++ b/config/rootfiles/packages/armv5tel/samba
@@ -812,7 +812,6 @@ var/lib/samba
 var/lib/samba/bind-dns
 var/lib/samba/private
 var/lib/samba/winbindd_privileged
-var/log/samba
 var/nmbd
 srv/web/ipfire/cgi-bin/samba.cgi
 srv/web/ipfire/cgi-bin/sambahlp.cgi

diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba
index 089f6981d5e023d0046773e25281bb3f520266ad..e942471e2a2d619dd086c6e804f94676eb86d8d5 100644 (file)
--- a/config/rootfiles/packages/i586/samba
+++ b/config/rootfiles/packages/i586/samba
@@ -812,7 +812,6 @@ var/lib/samba
 var/lib/samba/bind-dns
 var/lib/samba/private
 var/lib/samba/winbindd_privileged
-var/log/samba
 var/nmbd
 srv/web/ipfire/cgi-bin/samba.cgi
 srv/web/ipfire/cgi-bin/sambahlp.cgi

diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba
index ff2b7d5c3e201a8682d8527e1f9e23905eb21909..1c31256db12c943d7144bd949af37285afcd4973 100644 (file)
--- a/config/rootfiles/packages/x86_64/samba
+++ b/config/rootfiles/packages/x86_64/samba
@@ -812,7 +812,6 @@ var/lib/samba
 var/lib/samba/bind-dns
 var/lib/samba/private
 var/lib/samba/winbindd_privileged
-var/log/samba
 var/nmbd
 srv/web/ipfire/cgi-bin/samba.cgi
 srv/web/ipfire/cgi-bin/sambahlp.cgi

diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 8ca32d67537c12c019208f8bf539aacee8379737..1fec05c35b084181802dece075b0f8358890c1a1 100644 (file)
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -67,6 +67,7 @@ my %sections = (
         'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
         'pakfire' => '(pakfire:)',
         'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])',
+       'samba' => '(nmbd|smbd|winbind)\[\d+\]:',
         'suricata' => '(suricata: )',
         'squid' => '(squid\[.*\]: |squid: )',
         'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
@@ -95,6 +96,7 @@ my %trsections = (
         'openvpn' => 'OpenVPN',
         'pakfire' => 'Pakfire',
         'red' => 'RED',
+       'samba' => $Lang::tr{'samba'},
         'suricata' => "$Lang::tr{'intrusion detection'}",
         'squid' => "$Lang::tr{'web proxy'}",
         'ssh' => 'SSH',

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 4668cd253eaef2591d83b03166e5d9d1a95a0f45..0510f0f24ecd72c0f2d78fadc5ac453db0a19f75 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -38,9 +38,6 @@ my %mainsettings = ();
 my $message = "";
 my $errormessage = "";
 
-my @Logs = qx(ls /var/log/samba/);
-my $Log =$Lang::tr{'no log selected'};
-
 my $Status = qx(/usr/local/bin/sambactrl smbstatus);
 $Status = &Header::cleanhtml($Status);
 
@@ -88,7 +85,6 @@ $sambasettings{'PASSWORDSYNC'} = 'off';
 $sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
 $sambasettings{'GUESTACCOUNT'} = 'samba';
 $sambasettings{'MAPTOGUEST'} = 'Bad User';
-$sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2';
 $sambasettings{'WIDELINKS'} = 'on';
 $sambasettings{'UNIXEXTENSION'} = 'off';
 ### Values that have to be initialized
@@ -149,7 +145,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
        $sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
        $sambasettings{'GUESTACCOUNT'} = 'samba';
        $sambasettings{'MAPTOGUEST'} = 'Bad User';
-       $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2';
 ### Samba CUPS Variablen
        $sambasettings{'LOADPRINTERS'} = 'Yes';
        $sambasettings{'PRINTING'} = 'cups';
@@ -278,8 +273,8 @@ winbind uid = 10000-20000
 winbind gid = 10000-20000
 winbind use default domain = yes
 
-log file  = /var/log/samba/samba-log.%m
-log level = $sambasettings{'LOGLEVEL'}
+# Log to syslog
+logging = syslog
 
 preferred master = $sambasettings{'PREFERREDMASTER'}
 domain master = $sambasettings{'DOMAINMASTER'}
@@ -427,7 +422,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{'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 |
                                                                                                                                                                                <font size='2' color='$Header::colourovpn'><b>   OpenVpn  -  $ovpnip[0].$ovpnip[1].$ovpnip[2].$ovpnip[3]/$ovpnnetwork[1]</b></font></td></tr>
@@ -1147,42 +1141,6 @@ END
 ;
 &Header::closebox();
 
-############################################################################################################################
-############################################### Anzeige der Sambalogs ######################################################
-
-
-if ($sambasettings{'ACTION'} eq 'showlog')
-{
-$Log = qx(tail -n $sambasettings{'LOGLINES'} /var/log/samba/$sambasettings{'LOG'});
-$Log=~s/\n/<br \/>/g;
-}
-
-&Header::openbox('100%', 'center', $Lang::tr{'log'});
-
-print <<END
-<a name="$Lang::tr{'log view'}"></a>
-<br />
-<form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'log view'}'>
-<table width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'log view'}</b></td></tr>
-<tr><td colspan='3'  align='left'><br /></td></tr>
-<tr><td  align='left'><select name='LOG' style="width: 200px">
-END
-;
-foreach my $log (@Logs) {chomp $log;print"<option value='$log'>$log</option>";}
-print <<END
-
-</select></td><td  align='left'>$Lang::tr{'show last x lines'}<input type='text' name='LOGLINES' value='$LOGLINES' size="3" /></td>
-                       <td  align='left'><input type='hidden' name='ACTION' value='showlog' /><input type='image' alt='view Log' title='view Log' src='/images/format-justify-fill.png' /></td></tr>
-<tr><td colspan='3'  align='left'><br /></td></tr>
-<tr><td colspan='3'  align='left'><font size=2>$Log</font></td></tr>
-<tr><td colspan='3'  align='left'><br /></td></tr>
-<tr><td colspan='3'  align='center'>$sambasettings{'LOG'}</td></tr>
-</table>
-</form>
-END
-;
-&Header::closebox();
 &Header::closebigbox();
 &Header::closepage();
 

diff --git a/lfs/samba b/lfs/samba
index 874166d2e306e2413b765e417caa17dffb124815..cd20baffc349259ba98aa1f985f99f6736dc67bf 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -109,7 +109,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cat /var/ipfire/samba/global /var/ipfire/samba/shares > /var/ipfire/samba/smb.conf
        rm -rf /var/lib/samba/private
        ln -s /var/ipfire/samba/private /var/lib/samba/private
-       -mkdir -p /var/log/samba
        install -v -m 644 $(DIR_SRC)/config/backup/includes/samba /var/ipfire/backup/addons/includes/samba
 
        -mkdir -p /var/lib/samba/winbindd_privileged