VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-15 21:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set password at creation time if available https://sourceforge.net/p/webadmin/bugs/5314

Browse Source
This commit is contained in:
Jamie Cameron
2019-10-12 12:14:57 -07:00
parent e4d4ed51de
commit 6b62d7be44
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samba/make_epass.cgi
View File

@ -100,7 +100,7 @@ while(@uinfo = getpwent()) {
else { else {
$nu->{'opts'} = \@flags; $nu->{'opts'} = \@flags;
} }
&create_user($nu); &create_user($nu, $in{'newmode'} == 2 ? $in{'newpass'} : undef);
$created++; $created++;
} }
if ($m) { if ($m) {

21
samba/samba-lib.pl
View File

@ -629,21 +629,22 @@ return $config{'samba_password_program'}.
$config{'smb_conf'}." ".$args; $config{'smb_conf'}." ".$args;
} }
# create_user(&user) # create_user(&user, [plainpass])
# Add a user to the samba password file # Add a user to the samba password file
sub create_user sub create_user
{ {
local ($user, $plainpass) = @_;
if ($has_pdbedit) { if ($has_pdbedit) {
# Use the pdbedit command # Use the pdbedit command
local $ws = &indexof("W", @{$_[0]->{'opts'}}) >= 0 ? "-m" : ""; local $ws = &indexof("W", @{$user->{'opts'}}) >= 0 ? "-m" : "";
local @opts = grep { $_ ne "U" && $_ ne "W" } @{$_[0]->{'opts'}}; local @opts = grep { $_ ne "U" && $_ ne "W" } @{$user->{'opts'}};
local $temp = &transname(); local $temp = &transname();
&open_tempfile(TEMP, ">$temp", 0, 1); &open_tempfile(TEMP, ">$temp", 0, 1);
&print_tempfile(TEMP, "\n\n"); &print_tempfile(TEMP, $plainpass."\n".$plainpass."\n");
&close_tempfile(TEMP); &close_tempfile(TEMP);
local $out = &backquote_logged( local $out = &backquote_logged(
"cd / && $config{'pdbedit'} -a -s $config{'smb_conf'} -t -u ". "cd / && $config{'pdbedit'} -a -s $config{'smb_conf'} -t -u ".
quotemeta($_[0]->{'name'}). quotemeta($user->{'name'}).
($config{'sync_gid'} ? " -G $config{'sync_gid'}" : ""). ($config{'sync_gid'} ? " -G $config{'sync_gid'}" : "").
" -c '[".join("", @opts)."]' $ws <$temp 2>&1"); " -c '[".join("", @opts)."]' $ws <$temp 2>&1");
$? && &error("$config{'pdbedit'} failed : <pre>$out</pre>"); $? && &error("$config{'pdbedit'} failed : <pre>$out</pre>");
@ -653,14 +654,14 @@ else {
local $out = &backquote_logged( local $out = &backquote_logged(
"cd / && ".&smbpasswd_cmd( "cd / && ".&smbpasswd_cmd(
"-a ". "-a ".
(&indexof("D", @{$_[0]->{'opts'}}) >= 0 ? "-d " : ""). (&indexof("D", @{$user->{'opts'}}) >= 0 ? "-d " : "").
(&indexof("N", @{$_[0]->{'opts'}}) >= 0 ? "-n " : ""). (&indexof("N", @{$user->{'opts'}}) >= 0 ? "-n " : "").
(&indexof("W", @{$_[0]->{'opts'}}) >= 0 ? "-m " : ""). (&indexof("W", @{$user->{'opts'}}) >= 0 ? "-m " : "").
quotemeta($_[0]->{'name'}))); quotemeta($user->{'name'})));
if ($?) { if ($?) {
# Add direct to Samba password file # Add direct to Samba password file
&open_tempfile(PASS, ">>$config{'smb_passwd'}"); &open_tempfile(PASS, ">>$config{'smb_passwd'}");
&print_tempfile(PASS, &user_string($_[0])); &print_tempfile(PASS, &user_string($user));
&close_tempfile(PASS); &close_tempfile(PASS);
chown(0, 0, $config{'smb_passwd'}); chown(0, 0, $config{'smb_passwd'});
chmod(0600, $config{'smb_passwd'}); chmod(0600, $config{'smb_passwd'});

26
samba/useradmin_update.pl
View File

@ -5,32 +5,34 @@ do 'samba-lib.pl';
# Create a new samba user if sync is enabled # Create a new samba user if sync is enabled
sub useradmin_create_user sub useradmin_create_user
{ {
local ($user) = @_;
&get_share("global"); &get_share("global");
if (&istrue("encrypt passwords") && ($config{'smb_passwd'} || $has_pdbedit) && if (&istrue("encrypt passwords") && ($config{'smb_passwd'} || $has_pdbedit) &&
$config{'sync_add'} && !&get_user($_[0]->{'user'})) { $config{'sync_add'} && !&get_user($user->{'user'})) {
# Add a user to smbpasswd # Add a user to smbpasswd
&lock_file($config{'smb_passwd'}); &lock_file($config{'smb_passwd'});
local $u = { 'name' => $_[0]->{'user'}, local $u = { 'name' => $user->{'user'},
'uid' => $_[0]->{'uid'} }; 'uid' => $user->{'uid'} };
if ($samba_version >= 2) { if ($samba_version >= 2) {
local @opts = ("U"); local @opts = ("U");
push(@opts, "N") if ($_[0]->{'passmode'} == 0); push(@opts, "N") if ($user->{'passmode'} == 0);
push(@opts, "D") if ($_[0]->{'passmode'} == 1); push(@opts, "D") if ($user->{'passmode'} == 1);
$u->{'opts'} = \@opts; $u->{'opts'} = \@opts;
} }
else { else {
$u->{'real'} = $_[0]->{'real'}; $u->{'real'} = $user->{'real'};
$u->{'home'} = $_[0]->{'home'}; $u->{'home'} = $user->{'home'};
$u->{'shell'} = $_[0]->{'shell'}; $u->{'shell'} = $user->{'shell'};
} }
$u->{'pass1'} = $u->{'pass2'} = ("X" x 32); $u->{'pass1'} = $u->{'pass2'} = ("X" x 32);
if ($_[0]->{'passmode'} == 0) { if ($user->{'passmode'} == 0) {
$u->{'pass1'} = "NO PASSWORDXXXXXXXXXXXXXXXXXXXXX"; $u->{'pass1'} = "NO PASSWORDXXXXXXXXXXXXXXXXXXXXX";
$u->{'pass2'} = $u->{'pass1'}; $u->{'pass2'} = $u->{'pass1'};
} }
&create_user($u); &create_user($u, $user->{'passmode'} == 3 ? $user->{'plainpass'}
if ($_[0]->{'passmode'} == 3) { : undef);
&set_password($_[0]->{'user'}, $_[0]->{'plainpass'}); if ($user->{'passmode'} == 3) {
&set_password($user->{'user'}, $user->{'plainpass'});
} }
&unlock_file($config{'smb_passwd'}); &unlock_file($config{'smb_passwd'});
} }