Maniacikarus Samba.cgi eingespielt

mISDN eingebaut git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@423 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-09 18:45:54 +02:00 · 2007-02-17 22:00:37 +00:00
parent 09eb4f0073
commit 1ee8bf5d7f
7 changed files with 502 additions and 167 deletions
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16
-# Sun Feb  4 15:26:41 2007
+# Thu Feb 15 06:11:38 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -1356,13 +1356,26 @@ CONFIG_ISDN_DRV_AVMB1_C4=m
 #
 # Active Eicon DIVA Server cards
 #
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
+# CONFIG_CAPI_EICON is not set
+
+#
+# Modular ISDN driver
+#
+CONFIG_MISDN_DRV=m
+# CONFIG_MISDN_MEMDEBUG is not set
+CONFIG_MISDN_AVM_FRITZ=y
+CONFIG_MISDN_NETJET=y
+CONFIG_MISDN_HFCPCI=y
+# CONFIG_MISDN_HFCMULTI is not set
+# CONFIG_HFCMULTI_PCIMEM is not set
+CONFIG_MISDN_HFCUSB=y
+CONFIG_MISDN_HFCMINI=y
+CONFIG_MISDN_XHFC=y
+CONFIG_MISDN_SPEEDFAX=y
+CONFIG_MISDN_W6692=y
+CONFIG_MISDN_DSP=y
+CONFIG_MISDN_LOOP=y
+CONFIG_MISDN_L1OIP=y

 #
 # Telephony Support
--- a/config/kernel/kernel.config.i586.smp
+++ b/config/kernel/kernel.config.i586.smp
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16
-# Sun Feb  4 15:27:11 2007
+# Thu Feb 15 06:11:51 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -1356,13 +1356,26 @@ CONFIG_ISDN_DRV_AVMB1_C4=m
 #
 # Active Eicon DIVA Server cards
 #
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
+# CONFIG_CAPI_EICON is not set
+
+#
+# Modular ISDN driver
+#
+CONFIG_MISDN_DRV=m
+# CONFIG_MISDN_MEMDEBUG is not set
+CONFIG_MISDN_AVM_FRITZ=y
+CONFIG_MISDN_NETJET=y
+CONFIG_MISDN_HFCPCI=y
+# CONFIG_MISDN_HFCMULTI is not set
+# CONFIG_HFCMULTI_PCIMEM is not set
+CONFIG_MISDN_HFCUSB=y
+CONFIG_MISDN_HFCMINI=y
+CONFIG_MISDN_XHFC=y
+CONFIG_MISDN_SPEEDFAX=y
+CONFIG_MISDN_W6692=y
+CONFIG_MISDN_DSP=y
+CONFIG_MISDN_LOOP=y
+CONFIG_MISDN_L1OIP=y

 #
 # Telephony Support
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -62,6 +62,7 @@ var/ipfire/main
 #var/ipfire/main/settings
 var/ipfire/mbmon
 #var/ipfire/mbmon/settings
+var/ipfire/menu.d
 var/ipfire/modem
 #var/ipfire/modem/defaults
 #var/ipfire/modem/settings
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -142,6 +142,7 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * linux-2.6.16.29-ipfire
+* linux-2.6.16.29-ipfire-smp_old
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
 * linuxigd-0.95
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -25,9 +25,16 @@ my $errormessage = "";
 my $shareentry = "";
 my @shares = ();
 my @shareline = ();
+my $shareconfigentry = "";
+my @sharesconfig = ();
+my @shareconfigline = ();
+my $userentry = "";
+my @user = ();
+my @userline = ();
 my @proto = ();
 my %selected= () ;
 my $sharefile = "/var/ipfire/samba/shares";
+my $userfile = "/var/ipfire/samba/private/smbpasswd";
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 &General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);

@@ -40,22 +47,22 @@ my %servicenames =

 &Header::showhttpheaders();

-$sambasettings{'ENABLED'} = 'off';
-$sambasettings{'EDIT'} = 'no';
-$sambasettings{'VALID'} = 'yes';
 $sambasettings{'WORKGRP'} = 'homeip.net';
 $sambasettings{'NETBIOSNAME'} = 'IPFIRE';
-$sambasettings{'SRVSTRING'} = 'Samba Server %v running on IPFire 2.0';
-$sambasettings{'INTERFACES'} = 'eth0';
+$sambasettings{'SRVSTRING'} = 'Samba Server running on IPFire 2.0';
+$sambasettings{'INTERFACES'} = '';
 $sambasettings{'SECURITY'} = 'share';
-$sambasettings{'OSLEVEL'} = '20';
-$sambasettings{'PDC'} = 'off';
+$sambasettings{'OSLEVEL'} = '65';
 $sambasettings{'GREEN'} = 'on';
 $sambasettings{'BLUE'} = 'off';
 $sambasettings{'ORANGE'} = 'off';
 $sambasettings{'VPN'} = 'off';
-$sambasettings{'WINSSERV'} = '';
-$sambasettings{'WINS'} = 'off';
+$sambasettings{'WINSSRV'} = "$netsettings{'GREEN_NETADDRESS'}";
+$sambasettings{'WINSSUPPORT'} = 'off';
+$sambasettings{'OTHERINTERFACES'} = '';
+$sambasettings{'GUESTACCOUNT'} = 'samba';
+$sambasettings{'MAPTOGUEST'} = 'Never';
+$sambasettings{'BINDINTERFACESONLY'} = 'True';
 ### Values that have to be initialized
 $sambasettings{'ACTION'} = '';

@@ -68,47 +75,112 @@ $sambasettings{'ACTION'} = '';
 ############################################################################################################################
 ############################################################################################################################

-if ($sambasettings{'ACTION'} eq $Lang::tr{'save'})
+if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system('/usr/local/bin/sambactrl 1 $sambasettings{"NAME"}');}
+if ($sambasettings{'ACTION'} eq 'smbuserenable'){system('/usr/local/bin/sambactrl 2 $sambasettings{"NAME"}');}
+if ($sambasettings{'ACTION'} eq 'smbuserdelete'){system('/usr/local/bin/sambactrl 3 $sambasettings{"NAME"}');}
+if ($sambasettings{'ACTION'} eq 'smbuseradd'){system('/usr/local/bin/sambactrl 4 $username $password');}
+if ($sambasettings{'ACTION'} eq 'smbchangepw'){system('/usr/local/bin/sambactrl 5 $username $password');}
+if ($sambasettings{'ACTION'} eq 'smbsharechange'){system('/usr/local/bin/sambactrl 7 $sambasettings{"SHARENAME"} $sambasettings{"SHAREOPTION"}');}
+if ($sambasettings{'ACTION'} eq 'smbstart'){system('/usr/local/bin/sambactrl 8');}
+if ($sambasettings{'ACTION'} eq 'smbstop'){system('/usr/local/bin/sambactrl 9');}
+
+############################################################################################################################
+############################################## Samba Share neu anlegen #####################################################
+
+if ($sambasettings{'ACTION'} eq 'smbshareadd')
 {
-        &General::writehash("${General::swroot}/samba/settings", \%sambasettings);
+  my $emptyline= ""; 
+  system('/usr/local/bin/sambactrl 6');
+	open (FILE, ">>${General::swroot}/samba/shares") or die "Can't save the shares settings: $!";
+	flock (FILE, 2);
+	
+print FILE <<END
+$sambasettings{'SHAREOPTION'}
+$emptyline
+END
+;
+close FILE;
 }

-&General::readhash("${General::swroot}/samba/settings", \%sambasettings);
+############################################################################################################################
+############################################################################################################################
+
+if ($sambasettings{'ACTION'} eq $Lang::tr{'save'})
+{
+$sambasettings{'INTERFACES'} = '';
+if ($checked{'GREEN'}){ $sambasettings{'INTERFACES'} = "$sambasettings{'INTERFACES'} $netsettings{'GREEN_DEV'}";}
+if ($checked{'BLUE'}){ $sambasettings{'INTERFACES'} = "$sambasettings{'INTERFACES'} $netsettings{'BLUE_DEV'}";}
+if ($checked{'ORANGE'}){ $sambasettings{'INTERFACES'} = "$sambasettings{'INTERFACES'} $netsettings{'ORANGE_DEV'}";}
+if ($checked{'VPN'}){ $sambasettings{'INTERFACES'} = "$sambasettings{'INTERFACES'} $ovpnsettings{'DDEVICE'}";}
+if ($sambasettings{'OTHERINTERFACES'} ne ''){ $sambasettings{'INTERFACES'} = "$sambasettings{'INTERFACES'} $sambasettings{'OTHERINTERFACES'}";}
+
+############################################################################################################################
+############################################################################################################################	
+
+  &General::writehash("${General::swroot}/samba/settings", \%sambasettings);
+
+	open (FILE, ">${General::swroot}/samba/global") or die "Can't save the global settings: $!";
+	flock (FILE, 2);
+	
+print FILE <<END
+  # global.settings by IPFire Project
+
+  [global]
+	netbios name = $sambasettings{'NETBIOSNAME'}
+	server string = $sambasettings{'SRVSTRING'}
+	workgroup = $sambasettings{'WORKGRP'}
+
+	keep alive = 30
+	os level = $sambasettings{'OSLEVEL'}
+	fstype = NTFS
+	
+	preferred master = yes
+	domain master = yes
+	local master = yes
+
+	kernel oplocks = false
+	map to guest = $sambasettings{'MAPTOGUEST'}
+	smb ports = 445 139
+	unix charset = CP850
+
+	security = $sambasettings{'SECURITY'}
+	encrypt passwords = yes
+	guest account = $sambasettings{'GUESTACCOUNT'}
+	unix password sync = no
+	null passwords = yes
+
+	bind interfaces only = $sambasettings{'BINDINTERFACESONLY'}
+	interfaces = $sambasettings{'INTERFACES'}
+	socket options = TCP_NODELAY IPTOS_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE
+
+	username level = 1
+	wins support = $sambasettings{'WINSSUPPORT'}
+	local master = yes
+
+	log file       = /var/log/samba/samba-log.%m
+	lock directory = /var/lock/samba
+	pid directory = /var/run/
+
+END
+;
+	close FILE;
+}
+  &General::readhash("${General::swroot}/samba/settings", \%sambasettings);

 if ($errormessage) {
        &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
        print "<class name='base'>$errormessage\n";
        print "&nbsp;</class>\n";
        &Header::closebox();
-}
+                  }

-$checked{'PDC'}{'on'} = '';
-$checked{'PDC'}{'off'} = '';
-$checked{'PDC'}{"$sambasettings{'PDC'}"} = 'checked';
-$checked{'WINS'}{'on'} = '';
-$checked{'WINS'}{'off'} = '';
-$checked{'WINS'}{"$sambasettings{'WINS'}"} = 'checked';
-$checked{'GREEN'}{'on'} = '';
-$checked{'GREEN'}{'off'} = '';
-$checked{'GREEN'}{"$sambasettings{'GREEN'}"} = 'checked';
-$checked{'BLUE'}{'on'} = '';
-$checked{'BLUE'}{'off'} = '';
-$checked{'BLUE'}{"$sambasettings{'BLUE'}"} = 'checked';
-$checked{'ORANGE'}{'on'} = '';
-$checked{'ORANGE'}{'off'} = '';
-$checked{'ORANGE'}{"$sambasettings{'ORANGE'}"} = 'checked';
-$checked{'VPN'}{'on'} = '';
-$checked{'VPN'}{'off'} = '';
-$checked{'VPN'}{"$sambasettings{'VPN'}"} = 'checked';
+$checked{'WINSSUPPORT'}{$sambasettings{'WINSSUPPORT'}} = "checked='checked' ";
+$checked{'GREEN'}{$sambasettings{'GREEN'}} = "checked='checked' ";
+$checked{'BLUE'}{$sambasettings{'BLUE'}} = "checked='checked' ";
+$checked{'ORANGE'}{$sambasettings{'ORANGE'}} = "checked='checked' ";
+$checked{'VPN'}{$sambasettings{'VPN'}} = "checked='checked' ";

-$selected{'MAPTOGUEST'}{'Never'} = '';
-$selected{'MAPTOGUEST'}{'Bad User'} = '';
-$selected{'MAPTOGUEST'}{'Bad Password'} = '';
 $selected{'MAPTOGUEST'}{$sambasettings{'MAPTOGUEST'}} = "selected='selected'";
-$selected{'SECURITY'}{'share'} = '';
-$selected{'SECURITY'}{'user'} = '';
-$selected{'SECURITY'}{'server'} = '';
-$selected{'SECURITY'}{'domain'} = '';
 $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";

 ############################################################################################################################
@@ -116,25 +188,25 @@ $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";

 &Header::openbox('100%', 'center', 'Samba');
 print <<END
-        <table width='400px' cellspacing='0'>
+        <hr>
+        <table width='500px' cellspacing='0'><br>
 END
 ;
        if ( $message ne "" ) {
-                print "<tr><td colspan='3' align='center'><font color='red'>$message</font>";
+                print "<tr><td colspan='2' align='left'><font color='red'>$message</font>";
        }
-
-        my $lines = 0;
+print <<END        
+        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Alle Dienste</b></td></tr>
+        </table><table width='500px' cellspacing='0'>
+END
+;
        my $key = '';
        foreach $key (sort keys %servicenames)
        {
-                if ($lines % 2) {
-                        print "<tr bgcolor='${Header::table1colour}'>\n"; }
-                else {
-                        print "<tr bgcolor='${Header::table2colour}'>\n"; }
-                print "<td align='left'>$key</td>\n";
+                print "<tr><td align='left'>$key";
                my $shortname = $servicenames{$key};
                my $status = &isrunning($shortname);
-                print "$status\n";
+                print "$status</td>";
                print <<END
                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <input type='hidden' name='ACTION' value='restart $shortname'>
@@ -142,155 +214,381 @@ END
                        </form></td>
 END
 ;
-                print "</tr>\n";
-                $lines++;
        }
        print <<END
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                <tr><td><b>Alle Dienste:</b></td><td colspan='2'>
+                <table width='500px' cellspacing='0'><br>
+                <tr><td colspan='2' align='center'>
                <input type='submit' name='ACTION' value='Start' /> 
                <input type='submit' name='ACTION' value='Stop' /> 
                <input type='submit' name='ACTION' value='$Lang::tr{'restart'}' />
-                </td></tr></form>
-        </table>
-        <hr>
+                </td></tr></form></table>
+        
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-        <table width='500px'>
-        <tr><td colspan='2' align='left'>
-        <tr><td colspan='2' align='left'>
-        <tr><td colspan='2' align='left'><b>Basisoptionen</b>
-        <tr><td align='left'>Workgroup:<td><input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}'>
-        <tr><td align='left'>NetBIOS-Name:<td><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}'>
-        <tr><td align='left'>Server-String:<td><input type='text' name='SRVSTRING' value='$sambasettings{'SRVSTRING'}'>
-        <tr><td align='left'>Interfaces:<td><input type='checkbox' name='VPN' $checked{'VPN'}{'on'}><font size='2' color='$Header::colourovpn'><b>   OpenVpn  -  $ovpnsettings{'DDEVICE'}
-        <tr><td align='left'><td><input type='checkbox' name='GREEN' $checked{'GREEN'}{'on'}><font size='2' color='$Header::colourgreen'><b>   $Lang::tr{'green'}  -  $netsettings{'GREEN_DEV'}
+        <table width='500px' cellspacing='0'><br>
+        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Basisoptionen</b></td></tr>
+        <tr><td align='left'>Workgroup:</td><td><input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30"></td></tr>
+        <tr><td align='left'>NetBIOS-Name:</td><td><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}' size="30"></td></tr>
+        <tr><td align='left'>Server-String:</td><td><input type='text' name='SRVSTRING' value='$sambasettings{'SRVSTRING'}' size="30"></td></tr>
+        <tr><td align='left'>Interfaces:</td><td><input type='checkbox' name='VPN' $checked{'VPN'}{'on'}><font size='2' color='$Header::colourovpn'><b>   OpenVpn  -  $ovpnsettings{'DDEVICE'}</td></tr>
+        <tr><td align='left'></td><td><input type='checkbox' name='GREEN' $checked{'GREEN'}{'on'}><font size='2' color='$Header::colourgreen'><b>   $Lang::tr{'green'}  -  $netsettings{'GREEN_DEV'}</td></tr>
 END
 ;
         if (&Header::blue_used()){
         print <<END
-         <tr><td align='left'><td><input type='checkbox' name='BLUE' $checked{'BLUE'}{'on'}><font size='2' color='$Header::colourblue'><b>   $Lang::tr{'wireless'}  -  $netsettings{'BLUE_DEV'}
+         <tr><td align='left'></td><td><input type='checkbox' name='BLUE' $checked{'BLUE'}{'on'}><font size='2' color='$Header::colourblue'><b>   $Lang::tr{'wireless'}  -  $netsettings{'BLUE_DEV'}</td></tr>
 END
 ;
                                    }
         if (&Header::orange_used()){
         print <<END
-         <tr><td align='left'><td><input type='checkbox' name='ORANGE' $checked{'ORANGE'}{'on'}><font size='2' color='$Header::colourorange'><b>   $Lang::tr{'dmz'}  -  $netsettings{'ORANGE_DEV'}
+         <tr><td align='left'></td><td><input type='checkbox' name='ORANGE' $checked{'ORANGE'}{'on'}><font size='2' color='$Header::colourorange'><b>   $Lang::tr{'dmz'}  -  $netsettings{'ORANGE_DEV'}</td></tr>
 END
 ;
                                    }
        print <<END
-</select>
-        <tr><td colspan='2' align='left'>
-        <tr><td colspan='2' align='left'>
-        <tr><td colspan='2' align='left'><b>Sicherheitsoptionen</b>
-        <tr><td align='left'>Security:<td><select name='SECURITY'>
-                                                        <option value='share' $selected{'SECURITY'}{'share'}>SHARE</option>
-                                                        <option value='user' $selected{'SECURITY'}{'user'}>USER</option>
-                                                        <option value='server' $selected{'SECURITY'}{'server'}>SERVER</option>
-                                                        <option value='domain' $selected{'SECURITY'}{'domain'}>DOMAIN</option>
-                                                </select>
-
-        <tr><td colspan='2' align='left'>
-        <tr><td colspan='2' align='left'>
-        <tr><td colspan='2' align='left'><b>Browsingoptionen</b>
-        <tr><td align='left'>OS Level:<td><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}'>
-        <tr><td align='left'>Primary Domain Controller:<td>on   <input type='radio' name='PDC' value='on' $checked{'PDC'}{'on'}>/
-                                                                        <input type='radio' name='PDC' value='off' $checked{'PDC'}{'off'}> off
-
-        <tr><td colspan='2' align='left'>
-        <tr><td colspan='2' align='left'>
-        <tr><td colspan='2' align='left'><b>WINS-Optionen</b>
-        <tr><td align='left'>WINS-Server:<td><input type='text' name='WINSSRV' value='$sambasettings{'WINSSRV'}'>
-        <tr><td align='left'>WINS-Support:<td>on        <input type='radio' name='WINS' value='on' $checked{'WINS'}{'on'}>/
-                                                        <input type='radio' name='WINS' value='off' $checked{'WINS'}{'off'}> off
-
-        <tr><td colspan='1' align='right'><input type='submit' name='ACTION' value=$Lang::tr{'save'}>
+        <tr><td align='center'>weitere</td><td><input type='text' name='OTHERINTERFACES' value='$sambasettings{'OTHERINTERFACES'}' size="30"></td></tr>
+        <tr><td align='left'><br></td><td></td></tr>
+        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Sicherheitsoptionen</b></td></tr>
+        <tr><td align='left'>Security:</td><td><select name='SECURITY'>
+                    <option value='share' $selected{'SECURITY'}{'share'}>Share</option>
+                    <option value='user' $selected{'SECURITY'}{'user'}>User</option>
+                    <option value='domain' $selected{'SECURITY'}{'domain'}>Domain</option>
+                    <option value='ADS' $selected{'SECURITY'}{'ADS'}>ADS</option>
+                    <option value='server' $selected{'SECURITY'}{'server'}>Server</option>
+                    
+                    </select></td></tr>
+        <tr><td align='left'>Map to guest:</td><td><select name='MAPTOGUEST'>
+                    <option value='Never' $selected{'MAPTOGUEST'}{'Never'}>Never</option>
+                    <option value='Bad User' $selected{'MAPTOGUEST'}{'Bad User'}>Bad User</option>
+                    <option value='Bad Password' $selected{'MAPTOGUEST'}{'Bad Password'}>Bad Password</option>
+                    </select></td></tr>
+        <tr><td align='left'><br></td><td></td></tr>
+        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Browsingoptionen</b></td></tr>
+        <tr><td align='left'>OS Level:</td><td><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}' size="30"></td></tr>
+        <tr><td align='left'><br></td><td></td></tr>        
+        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>WINS-Optionen</b></td></tr>
+        <tr><td align='left'>WINS-Server:</td><td><input type='text' name='WINSSRV' value='$sambasettings{'WINSSRV'}' size="30"></td></tr>
+        <tr><td align='left'>WINS-Support:</td><td>on <input type='radio' name='WINSSUPPORT' value='on' $checked{'WINSSUPPORT'}{'on'}>/
+                                                        <input type='radio' name='WINSSUPPORT' value='off' $checked{'WINSSUPPORT'}{'off'}> off</td></tr>
+        <tr><td colspan='2' align='center'><input type='submit' name='ACTION' value=$Lang::tr{'save'}></td></tr>
        </table>
        </form>
 END
 ;
 &Header::closebox();

-&Header::openbox('100%', 'center', 'Shares');
+if ($sambasettings{'SECURITY'} eq 'user')
+{
+&Header::openbox('100%', 'center', 'accounting - user Security');

 print <<END
-        <hr>
-        <table width='500'>
-        <tr><th width='40%'>Name der Freigabe<th width='40%'>Pfad<th width='20%'>Optionen
+        <hr>        
+        <table width='500px' cellspacing='0'><br>
+        <tr><td colspan='6' align='left'>
+        <tr><td bgcolor='${Header::table1colour}' colspan='6' align='left'><b>Benutzerverwaltung</b>
+        <tr><td><u>Benutzername</u></td><td><u>Passwort</u></td><td><u>Status</u></td><td colspan='3' width="5"><u>Optionen</u></td></tr>
 END
 ;
-        open( FILE, "< $sharefile" ) or die "Unable to read $sharefile";
-        @shares = <FILE>;
-        close FILE;
-        foreach $shareentry (sort @shares)
+        open( FILE, "< $userfile") or die "Can't read user file: $!";
+        @user = <FILE>;
+        close(FILE);
+        foreach $userentry (sort @user)
        {
-                @shareline = split( /\;/, $shareentry );
-                print <<END
-                <tr><td align='center' bgcolor='#EAEAEA'><b>$shareline[0]</b>
-                    <td align='center' bgcolor='#EAEAEA'>$shareline[2]
-                    <td align='right'  bgcolor='#EAEAEA'>
-                        <table border='0'><tr>
+        @userline = split( /\:/, $userentry );
+        print <<END
+        <tr><td align='left'>$userline[0]</td><td>
 END
 ;
-                if ($shareline[1] eq 'enabled') {
-                        print <<END
-                                <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                        <input type='hidden' name='NAME' value='shareline[0]'>
-                                        <input type='hidden' name='ACTION' value='disable'>
-                                        <input type='image' alt='Ausschalten' src='/images/on.gif'>
-                                </form>
+        if ($userline[2] =~ m/N/){
+        print <<END
+        nicht gesetzt</td><td>
 END
 ;
-                } elsif ($shareline[1] eq 'disabled') {
-                        print <<END
-                                <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                        <input type='hidden' name='NAME' value='shareline[0]'>
-                                        <input type='hidden' name='ACTION' value='enable'>
-                                        <input type='image' alt='Einschalten' src='/images/off.gif'>
-                                </form>
+        }else{
+        print <<END
+        gesetzt</td><td>
 END
 ;
-                }
-                print <<END
-                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                <input type='hidden' name='NAME' value='shareline[0]'>
-                                <input type='hidden' name='ACTION' value='Bearbeiten'>
-                                <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
-                        </form>
-                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                <input type='hidden' name='NAME' value='shareline[0]'>
-                                <input type='hidden' name='ACTION' value='Loeschen'>
-                                <input type='image' alt='Loeschen' src='/images/delete.gif'>
-                        </form>
-                        </table>
+        }
+        if ($userline[2] =~ m/D/){
+        print <<END
+        aktiv</td>
+        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                        <input type='hidden' name='NAME' value='$userline[0]'>
+                                        <input type='hidden' name='ACTION' value='userdisable'>
+                                        <input type='image' alt='Deaktivieren' src='/images/off.gif'>
+                                </form></td>
+END
+;
+        }else{
+        print <<END
+        inaktiv</td>
+        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                        <input type='hidden' name='NAME' value='$userline[0]'>
+                                        <input type='hidden' name='ACTION' value='userenable'>
+                                        <input type='image' alt='Aktivieren' src='/images/on.gif'>
+                                </form></td>
 END
 ;
        }
        print <<END
-        <tr><td colspan='8' align='right' valign='middle'><b>Legende:</b>&nbsp;&nbsp;<img src='/images/edit.gif'>&nbsp;Freigabe bearbeiten | <img src='/images/delete.gif'>&nbsp;Freigabe loeschen &nbsp;
+        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                <input type='hidden' name='NAME' value='$userline[0]'>
+                                <input type='hidden' name='ACTION' value='userchangepw'>
+                                <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                        </form></td>
+        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                <input type='hidden' name='NAME' value='$userline[0]'>
+                                <input type='hidden' name='ACTION' value='userdelete'>
+                                <input type='image' alt='Loeschen' src='/images/delete.gif'>
+                        </form></td>
+        </td></tr>
+END
+;
+        }
+        print <<END
+        </table>
+        <table width='50px' cellspacing='0'><br>
+        <tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                               <input type='hidden' name='ACTION' value='useradd'>
+                               <input type='image' alt='Benutzer anlegen' src='/images/add.gif'></form></td>
+            <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                               <input type='hidden' name='ACTION' value='usercaption'>
+                               <input type='image' alt='Legende' src='/images/info.gif'></form>
+        </td><tr>
        </table>
 END
 ;
-
-&Header::closebox();
-
-
-if ($sambasettings{'SECURITY'} eq 'user')
+if ($sambasettings{'ACTION'} eq 'usercaption')
 {
-&Header::openbox('100%', 'center', 'User');
-
-print <<END
-        <hr>        
-        <table width='500'>
-        <tr><td colspan='2' align='left'>
-        <tr><td colspan='2' align='left'><b>Benutzerverwaltung</b>
+        print <<END
+        <table width='500px' cellspacing='0'><br>
+        <tr><td><b>Legende:</b></td></tr>
+        <tr><td><img src='/images/add.gif'>Benutzer neu anlegen</td></tr>
+        <tr><td><img src='/images/on.gif'>Benutzer aktivieren</td></tr>
+        <tr><td><img src='/images/off.gif'>Benutzer deaktivieren</td></tr>
+        <tr><td><img src='/images/edit.gif'>Passwort wechseln</td></tr>
+        <tr><td><img src='/images/delete.gif'>Benutzer loeschen</td></tr>
        </table>
 END
 ;
+}
+
+if ($sambasettings{'ACTION'} eq 'userchangepw')
+{       
+        my $username = "$sambasettings{'NAME'}";
+        my $password = 'samba';
+        print <<END
+        <hr>
+        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+        <table width='500px' cellspacing='0'><br>
+        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Passwort wechseln</b></td></tr>
+        <tr><td align='left'>Benutzername</td><td><input type='text' name='USERNAME' value='$username' size="30"></td></tr>
+        <tr><td align='left'>Passwort</td><td><input type='password' name='PASSWORD' value='$password' size="30"></td></tr>
+        <tr><td colspan='2' align='center'><input type='submit' name='ACTION' value='smbchangepw'></td></tr></form>
+        </table>
+END
+;
+}
+if ($sambasettings{'ACTION'} eq 'useradd')
+{
+        my $username = "User";
+        my $password = 'samba';
+        print <<END
+        <hr>
+        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+        <table width='500px' cellspacing='0'><br>
+        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Benutzer neu anlegen</b></td></tr>
+        <tr><td align='left'>Benutzername</td><td><input type='text' name='USERNAME' value='$username' size="30"></td></tr>
+        <tr><td align='left'>Passwort</td><td><input type='password' name='PASSWORD' value='$password' size="30"></td></tr>
+        <tr><td colspan='2' align='center'><input type='submit' name='ACTION' value='smbuseradd'></td></tr></form>
+        </table>
+END
+;
+}

 &Header::closebox();
 }
+        
+&Header::openbox('100%', 'center', 'Shares');

+print <<END
+        <hr>
+        <table width='500px' cellspacing='0'><br>
+        <tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>Shareverwaltung</b>
+        <tr><td><u>Names des Shares</u></td><td colspan='2' width="5"><u>Optionen</u></td></tr>
+END
+;
+        my @Zeilen;
+        my @Shares;
+        @shares = `grep -n '^\\[' $sharefile`;
+        foreach $shareentry (@shares)
+        {
+         @shareline = split( /\:/, $shareentry );
+         push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]);
+        }
+        
+        foreach $shareentry (sort @Shares)
+        {
+        print <<END
+        <tr><td align='left'>$shareentry</td>
+            <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                 <input type='hidden' name='NAME' value='$shareentry'>
+                 <input type='hidden' name='ACTION' value='sharechange'>
+                 <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+            </td></form>
+            <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                 <input type='hidden' name='NAME' value='$shareentry'>
+                 <input type='hidden' name='ACTION' value='Loeschen'>
+                 <input type='image' alt='Loeschen' src='/images/delete.gif'>
+            </td></form><tr>
+END
+;
+        }
+        print <<END
+        </table>
+
+        <table width='50px' cellspacing='0'><br>
+        <tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                               <input type='hidden' name='ACTION' value='shareadd'>
+                               <input type='image' alt='neuen Share anlegen' src='/images/add.gif'></form></td>
+            <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                               <input type='hidden' name='ACTION' value='sharecaption'>
+                               <input type='image' alt='Legende' src='/images/info.gif'></form>
+        </td><tr>
+        </table>
+END
+;
+if ($sambasettings{'ACTION'} eq 'sharecaption')
+{
+        print <<END
+        <table width='500px' cellspacing='0'><br>
+        <tr><td><b>Legende:</b></td></tr>
+        <tr><td><img src='/images/add.gif'>Share neu anlegen</td></tr>
+        <tr><td><img src='/images/edit.gif'>Share bearbeiten</td></tr>
+        <tr><td><img src='/images/delete.gif'>Share loeschen</td></tr>
+        </table>
+END
+;
+}
+
+if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optioncaption' )
+{
+
+my $defaultoption= "[Share]\npath = /shares/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\nguest ok = yes\npublic = yes\nforce user = samba";
+
+        print <<END
+        <hr>
+        <table width='500px' cellspacing='0'><br>
+        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>neuen Share anlegen</b></td></tr>
+        <tr><td colspan='2' align='center'></td></tr>
+        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+        <tr><td colspan='2' align='center'>Anzeige der Optionen fuer Shares<input type='hidden' name='ACTION' value='optioncaption'>
+                <input type='image' alt='Legende' src='/images/info.gif'></td></tr></form>
+        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+        <tr><td colspan='2' align='center'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$defaultoption</textarea></td></tr>
+        </table>
+        <table width='50px' cellspacing='0'><br>
+        <tr><td align='center'><input type='submit' name='ACTION' value='smbshareadd'></td></tr></form>
+        </table>
+END
+;
+}
+
+if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'optioncaption2' )
+{
+        my $sharename = "$sambasettings{'NAME'}";
+        my $shareoption = '';
+        chomp $sharename;
+        $sharename=~s/\s//g;
+
+        for(my $i = 0; $i <= $#Shares; $i++)
+         {
+          chomp $Shares[$i];
+          $Shares[$i]=~s/\s//g;
+          if ( "$Shares[$i]" eq "$sharename" )
+           {
+            my $Zeilenbegin = $Zeilen[$i+1]-2;
+            my $Zeilenende =  $Zeilen[$i+1]-$Zeilen[$i];
+            my $EOF = qx(cat $sharefile | wc -l);
+            if ( $Zeilen[$i] eq $Zeilen[$#Shares] )
+             {$Zeilenende =  $EOF-$Zeilen[$#Shares]+1;$Zeilenbegin = $EOF-$Zeilen[$#Shares]; $shareoption = qx(tail -$Zeilenende $sharefile | head -$Zeilenbegin);}
+            else{$shareoption = qx(head -$Zeilenbegin $sharefile | tail -$Zeilenende);}
+           }
+         }
+                 
+        print <<END
+        <hr>
+        <table width='500px' cellspacing='0'><br>
+        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Share bearbeiten</b></td></tr>
+        <tr><td colspan='2' align='center'></td></tr>
+        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+        <tr><td colspan='2' align='center'>Anzeige der Optionen fuer Shares<input type='hidden' name='ACTION' value='optioncaption2'>
+                <input type='image' alt='Legende' src='/images/info.gif'></td></tr></form>
+        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+        <tr><td colspan='2' align='center'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$shareoption</textarea></td></tr>
+        </table>
+        <table width='50px' cellspacing='0'><br>
+        <tr><td align='center'><input type='submit' name='ACTION' value='smbsharechange'></td></tr></form>
+        </table>
+END
+;
+}
+
+if ($sambasettings{'ACTION'} eq 'optioncaption' || $sambasettings{'ACTION'} eq 'optioncaption2')
+{
+        print <<END
+        <table width='500px' cellspacing='0'><br>
+        <tr><td><b>Legende:</b></td></tr>
+        <tr><td><u>Option</u></td><td><u>Bedeutung</u> / <u>Beispiel</u></td></tr>
+        <tr><td>comment</td><td>Kommentar</td></tr>
+        <tr><td></td><td>comment = Mein neues Share</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>path</td><td>Pfad zum Verzeichnis</td></tr>
+        <tr><td></td><td>path = /share/neu</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>writeable</td><td>Verzeichnis schreibbar</td></tr>
+        <tr><td></td><td>writeable = yes</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>browseable</td><td>sichtbar in Verzeichnisliste</td></tr>
+        <tr><td></td><td>browsable = yes</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>user</td><td>Besitzer der Freigabe</td></tr>
+        <tr><td></td><td>user = samba</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>valid users</td><td>Liste der Zugriffsberechtigten</td></tr>
+        <tr><td></td><td>valid users = samba, user1</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>write list</td><td>Liste der Schreibberechtigten</td></tr>
+        <tr><td></td><td>write list = samba</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>read list</td><td>Liste der nur Leseberechtigten</td></tr>
+        <tr><td></td><td>read list = user1</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>admin users</td><td>Liste der Benutzer mit SuperUser Rechten</td></tr>
+        <tr><td></td><td>admin users = user1</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>invalid users</td><td>Liste der Benutzer denen der Zugriff verweigert wird</td></tr>
+        <tr><td></td><td>invalid users = user2</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>force user</td><td>Standartbenutzer fuer alle Dateien</td></tr>
+        <tr><td></td><td>force user = samba</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>directory mask</td><td>UNIX Verzeichnisberchtigung beim Erzeugen</td></tr>
+        <tr><td></td><td>directory mask = 0777</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>create mask</td><td>UNIX Dateiberchtigung beim Erzeugen</td></tr>
+        <tr><td></td><td>create mask = 0777</td></tr>
+        <tr><td><br></td><td></td></tr>
+        <tr><td>guest ok</td><td>Annonymer Zugriff</td></tr>
+        <tr><td></td><td>guest ok = yes</td></tr>
+        </table>
+END
+;
+}
+
+&Header::closebox();
 &Header::closebigbox();
 &Header::closepage();

@@ -300,7 +598,7 @@ END
 sub isrunning
 {
        my $cmd = $_[0];
-        my $status = "<td bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
+        my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
        my $pid = '';
        my $testcmd = '';
        my $exename;
@@ -322,10 +620,10 @@ sub isrunning
                        close FILE;
                        if ($testcmd =~ /$exename/)
                        {
-                                $status = "<td bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
+                                $status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
                        }
                }
        }

        return $status;
-}
+}
--- a/lfs/linux
+++ b/lfs/linux
@@ -48,6 +48,7 @@ endif
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
+	mISDN-CVS-2007-01-26.tar.bz2 \
 	squashfs3.0.tar.gz \
 	openswan-2.4.7.kernel-2.6-natt.patch.gz \
 	openswan-2.4.7.kernel-2.6-klips.patch.gz \
@@ -70,6 +71,7 @@ net4801.kernel.patch_2.4.31			= $(URL_IPFIRE)/net4801.kernel.patch_2.4.31
 netfilter-layer7-v2.6.tar.gz		= $(URL_IPFIRE)/netfilter-layer7-v2.6.tar.gz
 patch-2.6.16-nath323-1.3.bz2		= $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 squashfs3.0.tar.gz				= $(URL_IPFIRE)/squashfs3.0.tar.gz
+mISDN-CVS-2007-01-26.tar.bz2		= $(URL_IPFIRE)/mISDN-CVS-2007-01-26.tar.bz2

 $(DL_FILE)_MD5					= 50695965725367f39007023feac5e256
 patch-$(PATCHLEVEL).gz_MD5				= 1355ebc25ea57df398d20e1c1726ec9b
@@ -82,6 +84,7 @@ net4801.kernel.patch_2.4.31_MD5			= c7d64e3caedb2f2b10e1c11db7f73a04
 netfilter-layer7-v2.6.tar.gz_MD5			= 58135cd1aafaf4ae2fa478159206f064
 patch-2.6.16-nath323-1.3.bz2_MD5			= f926409ff703a307baf54b57ab75d138
 squashfs3.0.tar.gz_MD5				= 9fd05d0bfbb712f5fb95edafea5bc733
+mISDN-CVS-2007-01-26.tar.bz2_MD5			= 844c70dc851faffcae7549fd738c7b49

 install : $(TARGET)

@@ -147,9 +150,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_SRC)/patch-o-matic-ng* && \
 		./runme --batch --kernel-path=$(ROOT)/usr/src/$(THISAPP)/ --iptables-path=$(ROOT)/usr/src/iptables/ \
 			TARPIT sip-conntrack-nat rtsp-conntrack-nat \
-			mms-conntrack-nat #quake3-conntrack-nat
+			mms-conntrack-nat

 	# Layer7-patch
+	cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.6
 	cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.6.tar.gz
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.6/for_older_kernels/kernel-2.6.13-2.6.16-layer7-2.2.patch

@@ -159,6 +163,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# ip_conntrack permissions from 440 to 444
 	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch

+	# mISDN
+	cd $(DIR_SRC) && rm -rf mISDN-CVS-2007-01-26
+	cd $(DIR_SRC) && tar xfj $(DIR_DL)/mISDN-CVS-2007-01-26.tar.bz2
+	cd $(DIR_SRC)/mISDN-CVS-2007-01-26 && yes 'yes' | ./std2kern -k /usr/src/linux
+
 ifeq "$(SMP)" ""
 	# Only do this once on the non-SMP pass
 	cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz iptables-1.3.5
@@ -210,5 +219,5 @@ endif
 ifeq "$(SMP)" "1"
 	rm -rf /lib/modules/$(VER)-smp/pcmcia
 endif
-	@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs*
+	@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-CVS-2007-01-26 $(DIR_SRC)/netfilter-layer7-v2.6
 	@$(POSTBUILD)
--- a/make.sh
+++ b/make.sh
@@ -170,7 +170,7 @@ prepareenv() {
    # Setup environment
    set +h
    LC_ALL=POSIX
-    MAKETUNING="-j12"
+    MAKETUNING="-j4"
    export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
    unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD