IPsec: Allow sending DNS server addresses to RW clients

[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 ec41adc5dd0506b986897074567989902e2b8fc5..72e8ac63e57b95ca9f707bbd073e1151625aa8db 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -48,7 +48,7 @@ my %shares = &config("${General::swroot}/samba/shares");
 
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
 
 ############################################################################################################################
 #################################### Initialisierung von Samba Variablen fr global Settings ###############################
@@ -87,7 +87,7 @@ delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasetting
 
 if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system("/usr/local/bin/sambactrl smbuserdisable $sambasettings{'NAME'}");}
 if ($sambasettings{'ACTION'} eq 'smbuserenable'){system("/usr/local/bin/sambactrl smbuserenable $sambasettings{'NAME'}");}
-if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");}
+if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");}
 if ($sambasettings{'ACTION'} eq 'smbchangepw'){system("/usr/local/bin/sambactrl smbchangepw $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");}
 if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl smbrestart");}
 if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");}
@@ -482,18 +482,6 @@ END
                                                        <input type='password' name='PASSWORD' value='$password' size='30' />
                                                </td>
                                        </tr>
-                                       <tr>
-                                               <td align='left'>$Lang::tr{'unix group'}</td>
-                                               <td>
-                                                       <input type='text' name='GROUP' value='sambauser' size='30' />
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td align='left'>$Lang::tr{'unix shell'}</td>
-                                               <td>
-                                                       <input type='text' name='SHELL' value='/bin/false' size='30' />
-                                               </td>
-                                       </tr>
                                        <tr>
                                                <td colspan='2' align='center'>
                                                        <input type='hidden' name='ACTION' value='smbuseradd'>
@@ -835,6 +823,18 @@ if ($sambasettings{'ENCRYPTION'} =~ m/(desired|required)/) {
        print FILE "smb encrypt = $1\n";
 }
 
+# Include smb.conf.local
+if (-e "${General::swroot}/samba/smb.conf.local") {
+       open(LOCAL, "<${General::swroot}/samba/smb.conf.local");
+
+       # Copy content line by line
+       while (<LOCAL>) {
+               print FILE $_;
+       }
+
+       close(LOCAL);
+}
+
 print FILE <<END;
 # Export all printers
 [printers]