samba: Remove option to chose user group and shell

There is no need for this being implemented and it is dangerous to allow
the user to create any shell accounts or users that belong to groups
with higher privileges.

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

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 6a61300a2ae93b23006f99091048445c7f8336dd..4e0f14a01e5ae2417ac6ff21fb3d09792630df32 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -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'>

diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c
index eee396e7e61ea4626b05d52f88a27710374d633e..92ebef13a962a50f998d1625e4513b0649a0c908 100644 (file)
--- a/src/misc-progs/sambactrl.c
+++ b/src/misc-progs/sambactrl.c
@@ -79,7 +79,7 @@ int main(int argc, char *argv[]) {
                snprintf(command, BUFFER_SIZE-1, "/usr/sbin/groupadd sambauser >/dev/null");
                safe_system(command);
 
-               snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba User' -m -g %s -s %s %s >/dev/null", argv[4], argv[5], argv[2]);
+               snprintf(command, BUFFER_SIZE-1, "/usr/sbin/useradd -c 'Samba User' -m -g sambauser -s /bin/false %s >/dev/null", argv[2]);
                safe_system(command);
 
                snprintf(command, BUFFER_SIZE-1, "echo %s:%s | chpasswd", argv[2], argv[3]);