diff --git a/lam/lib/account.inc b/lam/lib/account.inc index 86003f04..97df04da 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -736,7 +736,6 @@ function createuser($values) { // Will create the LDAP-Account // 2 == Account already exists at different location // 1 == Account has been created // 4 == Error while creating Account - // values stored in shadowExpire, days since 1.1.1970 if ($values->unix_pwdexpire) { $date = $values->unix_pwdexpire / 86400 ; @@ -769,13 +768,18 @@ function createuser($values) { // Will create the LDAP-Account $attr['sambaPwdLastSet'] = time(); // sambaAccount_may } else { - $attr['sambaNTPassword'] = exec('../../lib/createntlm.pl nt ' . $values->smb_password); - $attr['sambaLMPassword'] = exec('../../lib/createntlm.pl lm ' . $values->smb_password); + if (file_exists('../../lib/createntlm.pl')) { // masscreate.php is at a different relative path + $attr['sambaNTPassword'] = exec('../../lib/createntlm.pl nt ' . $values->smb_password); + $attr['sambaLMPassword'] = exec('../../lib/createntlm.pl lm ' . $values->smb_password); + } + else { + $attr['sambaNTPassword'] = exec('../lib/createntlm.pl nt ' . $values->smb_password); + $attr['sambaLMPassword'] = exec('../lib/createntlm.pl lm ' . $values->smb_password); + } $attr['sambaPwdLastSet'] = time(); // sambaAccount_may } $attr['sambaSID'] = $values->smb_domain->SID . "-" . (2 * $values->general_uidNumber + $values->smb_domain->RIDbase); // sambaAccount_may - $attr['sambaPrimaryGroupSID'] = $values->smb_mapgroup; // sambaAccount_req - + if ($values->smb_mapgroup!='') $attr['sambaPrimaryGroupSID'] = $values->smb_mapgroup; // sambaAccount_req if ($values->smb_pwdcanchange!='') $attr['sambaPwdCanChange'] = $values->smb_pwdcanchange; // sambaAccount_may else $attr['sambaPwdCanChange'] = time(); // sambaAccount_may if ($values->smb_pwdmustchange!='') $attr['sambaPwdMustChange'] = $values->smb_pwdmustchange; // sambaAccount_may diff --git a/lam/templates/account/groupedit.php b/lam/templates/account/groupedit.php index 8459b04b..2e3eefbf 100644 --- a/lam/templates/account/groupedit.php +++ b/lam/templates/account/groupedit.php @@ -583,6 +583,12 @@ switch ($select_local) { // Select which part of page will be loaded case 'final': // Final Settings + $disabled = ""; + if ($_SESSION['config']->samba3 == 'yes') { + if (!isset($_SESSION['account']->smb_domain)) { // Samba page nit viewd; can not create group because if missing options + $disabled = "disabled"; + } + } echo ''; echo "\n"; echo "
";
@@ -603,7 +609,7 @@ switch ($select_local) { // Select which part of page will be loaded
echo _("Save profile");
echo "\n
| ||||
\n"; @@ -624,9 +630,7 @@ switch ($select_local) { // Select which part of page will be loaded echo _('Change GID-Number of all users in group to new value'); echo ' | ||||
";
echo "
|