Add support for the locked account flag for users, thanks to Juan Miguel Corral Cano.

diff --git a/samba/CHANGELOG b/samba/CHANGELOG
index 8dd8a1a..2eeb3d6 100644 (file)
--- a/samba/CHANGELOG
+++ b/samba/CHANGELOG
@@ -26,3 +26,5 @@ Show the real Samba version number on the main page.
 Fix list of users for a share to show open files correctly, and not show the same file multiple times on different shares.
 ---- Changes since 1.510 ----
 Try to use the smbpasswd command to create or delete users, if installed.
+---- Changes since 1.520 ----
+Add support for the locked account flag for users, thanks to Juan Miguel Corral Cano.

diff --git a/samba/edit_euser.cgi b/samba/edit_euser.cgi
index 11579e0..f00a67b 100755 (executable)
--- a/samba/edit_euser.cgi
+++ b/samba/edit_euser.cgi
@@ -67,7 +67,7 @@ else {
        map { $opt{uc($_)}++ } @{$u->{'opts'}};
        print "<tr> <td valign=top align=right><b>$text{'euser_option'}</b></td> <td colspan=3>\n";
        @ol = ($text{'euser_normal'}, "U", $text{'euser_nopwrequired'}, "N",
-              $text{'euser_disable'}, "D", $text{'euser_noexpire'}, "X", $text{'euser_trust'}, "W");
+              $text{'euser_disable'}, "D", $text{'euser_locked'}, "L" ,$text{'euser_noexpire'}, "X", $text{'euser_trust'}, "W");
        for($i=0; $i<@ol; $i+=2) {
                printf "<input type=checkbox name=opts value=%s %s> %s<br>\n",
                        $ol[$i+1], $opt{$ol[$i+1]} ? "checked" : "", $ol[$i];

diff --git a/samba/lang/en b/samba/lang/en
index a1d6453..b70b913 100644 (file)
--- a/samba/lang/en
+++ b/samba/lang/en
@@ -189,6 +189,7 @@ euser_shell=Shell
 euser_option=User options
 euser_normal=Normal user
 euser_noexpire=Password never expires
+euser_locked=Account is locked
 euser_nopwrequired=No password required
 euser_disable=Account disabled
 euser_trust=Workstation trust account

diff --git a/samba/lang/es b/samba/lang/es
index 5336992..15ac079 100644 (file)
--- a/samba/lang/es
+++ b/samba/lang/es
@@ -114,6 +114,7 @@ euser_name=Nombre de usuario
 euser_newpw=Nueva clave de acceso
 euser_noaccess=Sin acceso
 euser_noexpire=La clave no caduca
+euser_locked=Cuenta bloqueada
 euser_nopw=Sin clave de acceso
 euser_nopwrequired=No se requiere clave de acceso
 euser_normal=Usuario normal