my $message = "";
my $errormessage = "";
-my $Status = qx(/usr/local/bin/sambactrl smbstatus);
-$Status = &Header::cleanhtml($Status);
-
my $userentry = "";
my @user = ();
my @userline = ();
my $userfile = "${General::swroot}/samba/private/smbpasswd";
my %selected= () ;
-my $defaultoption= "[Share]\npath = /var/ipfire/samba/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\npublic = yes\nforce user = samba";
-my %shares = ();
+my $defaultoption= "[My Share]\npath = \ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0644\ndirectory mask = 0755\npublic = yes\nforce user = samba";
+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);
-
-############################################################################################################################
-############################################# Samba Dienste fr Statusberprfung ##########################################
-
-&Header::showhttpheaders();
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
############################################################################################################################
#################################### Initialisierung von Samba Variablen fr global Settings ###############################
-$sambasettings{'WORKGRP'} = 'homeip.net';
-$sambasettings{'INTERFACES'} = '';
-$sambasettings{'SECURITY'} = 'user';
+$sambasettings{'WORKGRP'} = uc($mainsettings{'DOMAINNAME'});
+$sambasettings{'ROLE'} = 'standalone';
$sambasettings{'REMOTEANNOUNCE'} = '';
$sambasettings{'REMOTESYNC'} = '';
$sambasettings{'GUESTACCOUNT'} = 'samba';
$sambasettings{'MAPTOGUEST'} = 'Bad User';
-$sambasettings{'WIDELINKS'} = 'on';
-$sambasettings{'UNIXEXTENSION'} = 'off';
$sambasettings{'ENCRYPTION'} = 'optional';
### Values that have to be initialized
$sambasettings{'ACTION'} = '';
############################################################################################################################
&General::readhash("${General::swroot}/samba/settings", \%sambasettings);
-&Header::getcgihash(\%sambasettings);
-if (($sambasettings{'WIDELINKS'} eq 'on') & ($sambasettings{'UNIXEXTENSION'} eq 'on'))
- {$errormessage = "$errormessage<br />Don't enable 'Wide links' and 'Unix extension' at the same time"; }
+# Hook to regenerate the configuration files.
+if ($ENV{"REMOTE_ADDR"} eq "") {
+ &writeconfiguration();
+ exit(0);
+}
+
+&Header::showhttpheaders();
+
+&Header::getcgihash(\%sambasettings);
+delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'};
&Header::openpage('Samba', 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
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 'smbpcadd'){system("/usr/local/bin/sambactrl smbpcadd $sambasettings{'PCNAME'} $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");}
$message .= &joindomain($sambasettings{'USERNAME'}, $sambasettings{'PASSWORD'});
}
-############################################################################################################################
-########################################### Samba Benutzer oder PC l�chen #################################################
+if ($sambasettings{'ACTION'} eq 'smbshareadd') {
+ $shares{'xvx'} = $sambasettings{'SHAREOPTION'};
+ &save("shares");
-if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");}
+ # Reload configuration
+ %shares = config("${General::swroot}/samba/shares");
+}
-############################################################################################################################
-##################################### Umsetzen der Werte von Checkboxen und Dropdowns ######################################
+if ($sambasettings{'ACTION'} eq 'smbsharedel') {
+ delete $shares{$sambasettings{'NAME'}};
+ &save("shares");
-if ($sambasettings{'ACTION'} eq $Lang::tr{'save'})
-{
-############################################################################################################################
-##################################### Schreiben settings und bersetzen fr smb.conf #######################################
+ # Reload configuration
+ %shares = config("${General::swroot}/samba/shares");
+}
-delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'};
-&General::writehash("${General::swroot}/samba/settings", \%sambasettings);
+if ($sambasettings{'ACTION'} eq 'smbsharechange') {
+ $shares{$sambasettings{'NAME'}} = $sambasettings{'SHAREOPTION'};
+ &save("shares");
-if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} = "yes";} else { $sambasettings{'WIDELINKS'} = "no";}
-if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'} = "yes";} else { $sambasettings{'UNIXEXTENSION'} = "no";}
+ # Reload configuration
+ %shares = config("${General::swroot}/samba/shares");
+}
############################################################################################################################
-############################################# Schreiben der Samba globals ##################################################
-
- 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]
-server string = Samba on IPFire
-
-workgroup = $sambasettings{'WORKGRP'}
-realm = $mainsettings{'DOMAINNAME'}
-passdb backend = smbpasswd
-
-wide links = $sambasettings{'WIDELINKS'}
-unix extensions = $sambasettings{'UNIXEXTENSION'}
+########################################### Samba Benutzer oder PC l�chen #################################################
-map to guest = $sambasettings{'MAPTOGUEST'}
+if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");}
-security = $sambasettings{'SECURITY'}
-guest account = $sambasettings{'GUESTACCOUNT'}
-unix password sync = no
+############################################################################################################################
+##################################### Umsetzen der Werte von Checkboxen und Dropdowns ######################################
-bind interfaces only = true
-interfaces = green0 blue0 127.0.0.0/8
-remote announce = $sambasettings{'REMOTEANNOUNCE'}
-remote browse sync = $sambasettings{'REMOTESYNC'}
+############################################################################################################################
+##################################### Schreiben settings und bersetzen fr smb.conf #######################################
-winbind separator = +
-winbind uid = 10000-20000
-winbind gid = 10000-20000
-winbind use default domain = yes
+if ($sambasettings{'ACTION'} eq $Lang::tr{'save'}) {
+ &General::writehash("${General::swroot}/samba/settings", \%sambasettings);
-# Log to syslog
-logging = syslog
+ # Write configuration to file
+ &writeconfiguration();
-END
-;
-
-if ($sambasettings{'ENCRYPTION'} =~ m/(desired|required)/) {
- print FILE "smb encrypt = $1\n";
+ system("/usr/local/bin/sambactrl smbreload");
}
-print FILE <<END;
-# Export all printers
-[printers]
-path = /var/spool/samba/
-printable = yes
-
-END
-close FILE;
-
-system("/usr/local/bin/sambactrl smbsafeconf");
-system("/usr/local/bin/sambactrl smbreload");
-}
- &General::readhash("${General::swroot}/samba/settings", \%sambasettings);
+&General::readhash("${General::swroot}/samba/settings", \%sambasettings);
if ($errormessage)
############################################################################################################################
########################################## Aktivieren von Checkboxen und Dropdowns #########################################
-$checked{'WIDELINKS'}{'off'} = '';
-$checked{'WIDELINKS'}{'on'} = '';
-$checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} = "checked='checked'";
-$checked{'UNIXEXTENSION'}{'off'} = '';
-$checked{'UNIXEXTENSION'}{'on'} = '';
-$checked{'UNIXEXTENSION'}{$sambasettings{'UNIXEXTENSION'}} = "checked='checked'";
$selected{'ENCRYPTION'}{'optional'} = '';
$selected{'ENCRYPTION'}{'desired'} = '';
$selected{'ENCRYPTION'}{'required'} = '';
$selected{'ENCRYPTION'}{$sambasettings{'ENCRYPTION'}} = "selected='selected'";
+$selected{'ROLE'}{'standalone'} = '';
+$selected{'ROLE'}{'member'} = '';
+$selected{'ROLE'}{$sambasettings{'ROLE'}} = "selected='selected'";
if ( $sambasettings{'MAPTOGUEST'} eq "Never" ) {
$sambasettings{'MAPTOGUEST'}="Bad User";
}
$selected{'MAPTOGUEST'}{$sambasettings{'MAPTOGUEST'}} = "selected='selected'";
-$selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";
############################################################################################################################
################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ###################################
);
print <<END;
- <table class="tbl" width='95%' cellspacing='0'>
+ <table class="tbl" width='100%' cellspacing='0'>
<tr bgcolor='$color{'color20'}'>
<td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td>
</tr>
<br>
- <table width="95%">
+ <table width="100%">
<td width="33%" align="center">
<form method="POST" action="$ENV{'SCRIPT_NAME'}">
<input type="hidden" name="ACTION" value="smbstart">
<br>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <table class="tbl" width='95%' cellspacing='0'>
+ <table class="tbl" width='100%' cellspacing='0'>
<tr bgcolor='$color{'color20'}'>
<td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td>
</tr>
<td align='left'><br /></td>
<td></td>
</tr>
- <tr>
- <td align='left' width='40%'>Wide links</td>
- <td align='left'>
- on <input type='radio' name='WIDELINKS' value='on' $checked{'WIDELINKS'}{'on'} /> /
- <input type='radio' name='WIDELINKS' value='off' $checked{'WIDELINKS'}{'off'} /> off
- </td>
- </tr>
- <tr>
- <td align='left' width='40%'>Unix extension</td>
- <td align='left'>
- on <input type='radio' name='UNIXEXTENSION' value='on' $checked{'UNIXEXTENSION'}{'on'} /> /
- <input type='radio' name='UNIXEXTENSION' value='off' $checked{'UNIXEXTENSION'}{'off'} /> off
- </td>
- </tr>
- <tr>
- <td align='left'><br /></td>
- <td></td>
- </tr>
<tr bgcolor='$color{'color20'}'>
<td colspan='2' align='left'><b>$Lang::tr{'security options'}</b></td>
</tr>
<tr>
<td align='left' width='40%'>$Lang::tr{'security'}</td>
<td align='left'>
- <select name='SECURITY' style="width: 165px">
- <option value='user' $selected{'SECURITY'}{'user'}>User</option>
- <option value='ADS' $selected{'SECURITY'}{'ADS'}>ADS</option>
- <option value='server' $selected{'SECURITY'}{'server'}>Server</option>
+ <select name='ROLE' style="width: 165px">
+ <option value='standalone' $selected{'ROLE'}{'standalone'}>$Lang::tr{'samba server role standalone'}</option>
+ <option value='member' $selected{'ROLE'}{'member'}>$Lang::tr{'samba server role member'}</option>
</select>
</td>
</tr>
############################################################################################################################
########################################## Benutzerverwaltung fr Usersecurity #############################################
-if ($sambasettings{'SECURITY'} eq 'user')
- {
+if ($sambasettings{'ROLE'} eq 'standalone') {
&Header::openbox('100%', 'center', $Lang::tr{'user management'});
- print <<END
- <a name="$Lang::tr{'accounting'}"></a>
- <br />
- <table class="tbl" width='95%' cellspacing='0'>
- <tr><td colspan='6' align='left'></td></tr>
- <tr><td bgcolor='$color{'color20'}' colspan='7' align='left'><b>$Lang::tr{'accounting'}</b></td></tr>
- <tr><td align='left'><u>$Lang::tr{'username'}</u></td><td align='left'><u>$Lang::tr{'password'}</u></td>
+
+ print <<END;
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr>
+ <th align='left'>$Lang::tr{'user'}</th>
+ <th colspan='3' width='5%'></th>
+ </tr>
END
-;
- print "<td></td>";
- print "<td align='left'><u>$Lang::tr{'status'}</u></td><td colspan='3' width='5%' align='center'><u>$Lang::tr{'options'}</u></td></tr>";
system('/usr/local/bin/sambactrl readsmbpasswd');
open(FILE, "<${General::swroot}/samba/private/smbpasswd") or die "Can't read user file: $!";
- @user = <FILE>;
+ my @users = <FILE>;
close(FILE);
system('/usr/local/bin/sambactrl locksmbpasswd');
-
+
my $lines = 0;
-
- foreach $userentry (sort @user)
- {
- @userline = split( /\:/, $userentry );
- if ($lines % 2) {print "<tr bgcolor='$color{'color20'}'>";} else {print "<tr bgcolor='$color{'color22'}'>";}
- print "<td align='left'>$userline[0]</td><td align='left'>";
- if ($userline[4] =~ /N/)
- {
- print "$Lang::tr{'not set'}</td><td align='left'>";
- }
- else
- {
- print "$Lang::tr{'set'}</td><td align='left'>";
- }
+ foreach $userentry (sort @users) {
+ @userline = split( /\:/, $userentry);
- print "</td><td align='left'>";
+ if ($lines % 2) {
+ print "<tr bgcolor='$color{'color20'}'>";
+ } else {
+ print "<tr bgcolor='$color{'color22'}'>";
+ }
- if ($userline[4] =~ /D/)
- {
- print <<END
- $Lang::tr{'inactive'}</td>
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <input type='hidden' name='NAME' value='$userline[0]' />
- <input type='hidden' name='ACTION' value='smbuserenable' />
- <input type='image' alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' />
- </form></td>
+ # Print username
+ print "<td align='left'>$userline[0]</td>";
+
+ if ($userline[4] =~ /D/) {
+ print <<END;
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='NAME' value='$userline[0]' />
+ <input type='hidden' name='ACTION' value='smbuserenable' />
+ <input type='image' alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' />
+ </form>
+ </td>
END
-;
- }
- else
- {
- print <<END
- $Lang::tr{'active'}</td>
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <input type='hidden' name='NAME' value='$userline[0]' />
- <input type='hidden' name='ACTION' value='smbuserdisable' />
- <input type='image' alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' />
- </form></td>
+ } else {
+ print <<END;
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='NAME' value='$userline[0]' />
+ <input type='hidden' name='ACTION' value='smbuserdisable' />
+ <input type='image' alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' />
+ </form>
+ </td>
END
-;
- }
+ }
- if ($userline[0] =~ /\$/)
- {
+ # Machine accounts can't be edited
+ if ($userline[0] =~ /\$/) {
print "<td></td>";
- }
- else
- {
- print <<END
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <input type='hidden' name='NAME' value='$userline[0]' />
- <input type='hidden' name='ACTION' value='userchangepw' />
- <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
- </form></td>
+ } else {
+ print <<END;
+ <td align='center'>
+ <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='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
+ </form>
+ </td>
END
-;
- }
+ }
- print <<END
- <td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+ print <<END;
+ <td align='center'>
+ <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='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-option-remove.png' />
- </form></td></tr>
+ <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
+ </form>
+ </td>
+ </tr>
END
-;
$lines++;
- }
- print <<END
- </table>
- <br />
- <table width='10%' cellspacing='0'>
- <tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <input type='hidden' name='ACTION' value='useradd' />
- <input type='image' alt='$Lang::tr{'add user'}' title='$Lang::tr{'add user'}' src='/images/user-option-add.png' /></form></td>
- </tr>
- </table>
+ }
+
+ print <<END;
+ </table>
+
+ <br>
+
+ <table width='10%' cellspacing='0'>
+ <tr>
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='ACTION' value='useradd'>
+ <input type='submit' value='$Lang::tr{'add user'}'>
+ </form>
+ </td>
+ </tr>
+ </table>
END
-;
- if ($sambasettings{'ACTION'} eq 'userchangepw')
- {
- my $username = "$sambasettings{'NAME'}";
+ if ($sambasettings{'ACTION'} eq 'userchangepw') {
+ my $username = $sambasettings{'NAME'};
my $password = 'samba';
+
print <<END
- <br />
- <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'change passwords'}</b></td></tr>
- <tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' readonly='readonly' /></td></tr>
- <tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
- <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbchangepw' />
- <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></td></tr>
- </table>
- </form>
+ <br>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'change passwords'}</b></td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'username'}</td>
+ <td>
+ <input type='text' name='USERNAME' value='$username' size='30' readonly='readonly' />
+ </td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'password'}</td>
+ <td>
+ <input type='password' name='PASSWORD' value='$password' size='30' />
+ </td>
+ </tr>
+ <tr>
+ <td colspan='2' align='center'>
+ <input type='hidden' name='ACTION' value='smbchangepw'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
END
-;
- }
+ }
- if ($sambasettings{'ACTION'} eq 'useradd')
- {
+ if ($sambasettings{'ACTION'} eq 'useradd') {
my $username = "user";
my $password = "samba";
chomp $username;
$username=~s/\s//g;
chomp $password;
$password=~s/\s//g;
- print <<END
- <br />
- <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add user'}</b></td></tr>
- <tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' /></td></tr>
- <tr><td align='left'>$Lang::tr{'password'}</td><td><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' />
- <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></td></tr>
- </table>
- </form>
-END
-;
- }
- if ($sambasettings{'ACTION'} eq 'pcadd')
- {
- my $pcname = "client\$";
- chomp $pcname;
- $pcname=~s/\s//g;
- print <<END
- <br />
- <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'pc add'}</b></td></tr>
- <tr><td align='left'>$Lang::tr{'client'}</td><td><input type='text' name='PCNAME' value='$pcname' size='30' /></td></tr>
- <tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambawks' 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='smbpcadd' />
- <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></td></tr>
- </table>
- </form>
+ print <<END;
+ <br>
+
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'add user'}</b></td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'username'}</td>
+ <td>
+ <input type='text' name='USERNAME' value='$username' size='30' />
+ </td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'password'}</td>
+ <td>
+ <input type='password' name='PASSWORD' value='$password' size='30' />
+ </td>
+ </tr>
+ <tr>
+ <td colspan='2' align='center'>
+ <input type='hidden' name='ACTION' value='smbuseradd'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
END
-;
- }
+ }
-&Header::closebox();
+ &Header::closebox();
}
-if ($sambasettings{'SECURITY'} eq "ADS") {
+if ($sambasettings{'ROLE'} eq "member") {
&Header::openbox('100%', 'center', $Lang::tr{'samba join a domain'});
my $AD_DOMAINNAME = uc($mainsettings{'DOMAINNAME'});
<form method="POST" action="$ENV{'SCRIPT_NAME'}">
<input type="hidden" name="ACTION" value="join">
- <table class="tbl" width="95%">
+ <table width="100%">
<tbody>
<tr>
<td width="40%">
&Header::openbox('100%', 'center', $Lang::tr{'shares'});
-my %shares = config("${General::swroot}/samba/shares");
-
-
-print <<END
-<a name="$Lang::tr{'manage shares'}"></a>
-<br />
-<table class="tbl" width='95%' cellspacing='0' class='tbl'>
-<tr><th bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage shares'}</b></th></tr>
-<tr><th align='left'><u>$Lang::tr{'sharename'}</u></th><th colspan='2' width="5%" align='center'><u>$Lang::tr{'options'}</u></th></tr>
+print <<END;
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr>
+ <th align='left'>$Lang::tr{'sharename'}</th>
+ <th colspan='2' width="5%" align='center'></th>
+ </tr>
END
-;
-my @Shares = keys(%shares);
+my @shares = keys(%shares);
my $lines = 0;
my $col="";
-foreach my $shareentry (sort @Shares)
- {
+foreach my $shareentry (sort @shares) {
chomp $shareentry;
+
if ($lines % 2) {
- print "<tr>";
- $col="bgcolor='$color{'color20'}'";
+ $col = "bgcolor='$color{'color20'}'";
} else {
- print "<tr>";
- $col="bgcolor='$color{'color22'}'";
- }
- print <<END
- <td align='left' $col>$shareentry</td>
- <td $col><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='NAME' value='$shareentry' />
- <input type='hidden' name='ACTION' value='sharechange' />
- <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
- </form></td>
- <td $col><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='NAME' value='$shareentry' />
- <input type='hidden' name='ACTION' value='smbsharedel' />
- <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
- </form></td></tr>
-END
-;
- $lines++;
+ $col = "bgcolor='$color{'color22'}'";
}
-print <<END
-</table>
-<br />
-<table width='10%' cellspacing='0'>
-<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='ACTION' value='shareadd' />
- <input type='image' alt='$Lang::tr{'add share'}' title='$Lang::tr{'add share'}' src='/images/list-add.png' />
- </form></td>
-</tr>
-</table>
+ print <<END;
+ <tr>
+ <td align='left' $col>$shareentry</td>
+ <td $col>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
+ <input type='hidden' name='NAME' value='$shareentry' />
+ <input type='hidden' name='ACTION' value='sharechange' />
+ <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
+ </form>
+ </td>
+ <td $col>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
+ <input type='hidden' name='NAME' value='$shareentry' />
+ <input type='hidden' name='ACTION' value='smbsharedel' />
+ <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
+ </form>
+ </td>
+ </tr>
END
;
+ $lines++;
+}
-if ($sambasettings{'ACTION'} eq 'shareadd')
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add share'}</b></td></tr>
- <tr><td colspan='2' align='center'></td></tr>
- <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'><tr><td colspan='2' align='center'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$defaultoption</textarea></td></tr>
+print <<END;
</table>
- <br />
- <table width='10%' cellspacing='0'>
- <tr><td align='center'><input type='hidden' name='ACTION' value='smbshareadd' />
- <input type='image' alt='$Lang::tr{'add share'}' title='$Lang::tr{'add share'}' src='/images/media-floppy.png' /></td></tr></form>
+
+ <br>
+
+ <table width='100%' cellspacing='0'>
+ <tr>
+ <td align='center'>
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='ACTION' value='shareadd'>
+ <input type='submit' value='$Lang::tr{'add share'}'>
+ </form>
+ </td>
+ </tr>
</table>
END
-;
- }
-if ($sambasettings{'ACTION'} eq 'sharechange')
- {
- my $shareoption = $shares{$sambasettings{'NAME'}};
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'edit share'}</b></td></tr>
- <tr><td colspan='2' align='center'></td></tr>
- <tr><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$shareoption</textarea></td></tr>
- </table>
- <br />
- <table width='10%' cellspacing='0'>
- <tr><td align='center'><input type='hidden' name='NAME' value='$sambasettings{'NAME'}' />
- <input type='image' alt='$Lang::tr{'change share'}' title='$Lang::tr{'change share'}' src='/images/media-floppy.png' />
- <input type='hidden' name='ACTION' value='smbsharechange' /></form></td></tr>
- </table>
+if ($sambasettings{'ACTION'} eq 'shareadd') {
+ print <<END;
+ <br />
+
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td align='left'><b>$Lang::tr{'add share'}</b></td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <textarea name="SHAREOPTION" cols="121" rows="15">$defaultoption</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <input type='hidden' name='ACTION' value='smbshareadd'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
END
-;
- }
+}
-if ($sambasettings{'ACTION'} eq 'smbshareadd')
- {
- $shares{'xvx'}= "$sambasettings{'SHAREOPTION'}";
- save("shares");
- my $shares = config("${General::swroot}/samba/shares");
- }
-if ($sambasettings{'ACTION'} eq 'smbsharedel')
- {
- delete $shares{$sambasettings{'NAME'}};
- save("shares");
- my %shares = config("${General::swroot}/samba/shares");
- }
-if ($sambasettings{'ACTION'} eq 'smbsharechange')
- {
- $shares{$sambasettings{'NAME'}} = $sambasettings{'SHAREOPTION'};
- save("shares");
- my %shares = config("${General::swroot}/samba/shares");
- }
+if ($sambasettings{'ACTION'} eq 'sharechange') {
+ my $shareoption = $shares{$sambasettings{'NAME'}};
+
+ print <<END;
+ <br />
+
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='NAME' value='$sambasettings{'NAME'}'>
+
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td align='left'><b>$Lang::tr{'edit share'}</b></td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <textarea name="SHAREOPTION" cols="121" rows="15">$shareoption</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <input type='hidden' name='ACTION' value='smbsharechange'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
+END
+}
&Header::closebox();
############################################################################################################################
############################################### Anzeige des Sambastatus ####################################################
-&Header::openbox('100%', 'center', 'Status');
+&Header::openbox('100%', 'left', $Lang::tr{'status'});
-print <<END
-<br />
-<table class="tbl" 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'><small><pre>$Status</pre></small></td></tr>
-</table>
+my $status = qx(/usr/local/bin/sambactrl smbstatus);
+$status = &Header::cleanhtml($status);
+
+print <<END;
+ <small>
+ <pre>$status</pre>
+ </small>
END
-;
+
&Header::closebox();
&Header::closebigbox();
return $status;
}
+sub writeconfiguration() {
+ 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]
+server string = Samba on IPFire
+
+workgroup = $sambasettings{'WORKGRP'}
+realm = $mainsettings{'DOMAINNAME'}
+passdb backend = smbpasswd
+
+map to guest = $sambasettings{'MAPTOGUEST'}
+
+guest account = $sambasettings{'GUESTACCOUNT'}
+unix password sync = no
+
+bind interfaces only = true
+interfaces = green0 blue0 127.0.0.0/8
+remote announce = $sambasettings{'REMOTEANNOUNCE'}
+remote browse sync = $sambasettings{'REMOTESYNC'}
+
+winbind separator = +
+winbind uid = 10000-20000
+winbind gid = 10000-20000
+winbind use default domain = yes
+
+# Log to syslog
+logging = syslog
+
+# Enable support for Apple
+vfs objects = catia fruit streams_xattr recycle
+
+# Enable following symlinks
+wide links = yes
+
+END
+
+# Server Role
+if ($sambasettings{'ROLE'} eq "standalone") {
+ print FILE "server role = standalone\n";
+} elsif ($sambasettings{'ROLE'} eq "member") {
+ print FILE "server role = member server\n";
+}
+
+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]
+path = /var/spool/samba/
+printable = yes
+
+END
+close FILE;
+
+ system("/usr/local/bin/sambactrl smbsafeconf");
+}
+
sub joindomain {
my $username = shift;
my $password = shift;
projects / ipfire-2.x.git / blobdiff