diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc index c9966bb0..c9309295 100644 --- a/lam/lib/modules/posixAccount.inc +++ b/lam/lib/modules/posixAccount.inc @@ -647,7 +647,10 @@ class posixAccount extends baseModule { $this->attributes['uid'][0] = $post['uid']; $this->attributes['cn'][0] = $post['cn']; if ($this->attributes['cn'][0] == '') { - if (isset($_SESSION[$this->base]->module['inetOrgPerson'])) { + if (($this->scope == 'host') && (substr($post['uid'], -1, 1) == '$')) { + $this->attributes['cn'][0] = substr($post['uid'], 0, strlen($post['uid']) - 1); + } + elseif (isset($_SESSION[$this->base]->module['inetOrgPerson'])) { if ($_SESSION[$this->base]->module['inetOrgPerson']->attributes['givenName'][0]) { $this->attributes['cn'][0] = $_SESSION[$this->base]->module['inetOrgPerson']->attributes['givenName'][0] . " " . $_SESSION[$this->base]->module['inetOrgPerson']->attributes['sn'][0]; } @@ -768,6 +771,12 @@ class posixAccount extends baseModule { // Check if Hostname contains only valid characters if ( !get_preg($this->attributes['uid'][0], 'hostname')) $triggered_messages['uid'][] = $this->messages['uid'][4]; + if (!$this->attributes['homeDirectory'][0]) { + $this->attributes['homeDirectory'][0] = '/dev/null'; + } + if (!$this->attributes['loginShell'][0]) { + $this->attributes['loginShell'][0] = '/bin/false'; + } } // Create automatic useraccount with number if original user already exists // Reset name to original name if new name is in use diff --git a/lam/lib/modules/sambaAccount.inc b/lam/lib/modules/sambaAccount.inc index cbc3b182..80d0ddfc 100644 --- a/lam/lib/modules/sambaAccount.inc +++ b/lam/lib/modules/sambaAccount.inc @@ -179,7 +179,6 @@ class sambaAccount extends baseModule { // available PDF fields $return['PDF_fields'] = array( 'displayName', - 'uid', 'smbHome', 'homeDrive', 'scriptPath', @@ -411,7 +410,6 @@ class sambaAccount extends baseModule { function module_ready() { if ($_SESSION[$this->base]->module['posixAccount']->attributes['gidNumber'][0]=='') return false; if ($_SESSION[$this->base]->module['posixAccount']->attributes['uidNumber'][0]=='') return false; - if ($this->attributes['uid'][0]=='') return false; return true; } @@ -517,15 +515,17 @@ class sambaAccount extends baseModule { if ($_SESSION[$this->base]->type=='host') { $this->attributes['primaryGroupID'][0] = $this->rids[_('Domain Computers')]; - if ($post['ResetSambaPassword']) { - $this->attributes['lmPassword'][0] = lmPassword($_SESSION[$this->base]->module['posixAccount']->attributes['uid'][0]); - $this->attributes['ntPassword'][0] = ntPassword($_SESSION[$this->base]->module['posixAccount']->attributes['uid'][0]); + if ($post['ResetSambaPassword'] || (!$this->attributes['lmPassword'][0])) { + $hostname = $_SESSION[$this->base]->module['posixAccount']->attributes['uid'][0]; + $hostname = substr($hostname, 0, strlen($hostname) - 1); + $this->attributes['lmPassword'][0] = lmPassword($hostname); + $this->attributes['ntPassword'][0] = ntPassword($hostname); $this->attributes['pwdLastSet'][0] = time(); } } - // Check values - if ($_SESSION[$this->base]->type=='user') { + // check values for user account + if ($this->scope == 'user') { $this->attributes['pwdCanChange'][0] = mktime($post['pwdCanChange_h'], $post['pwdCanChange_m'], $post['pwdCanChange_s'], $post['pwdCanChange_mon'], $post['pwdCanChange_day'], $post['pwdCanChange_yea']); $this->attributes['pwdMustChange'][0] = mktime($post['pwdMustChange_h'], $post['pwdMustChange_m'], $post['pwdMustChange_s'], @@ -575,37 +575,31 @@ class sambaAccount extends baseModule { else { $this->attributes['rid'][0] = $_SESSION[$this->base]->module['posixAccount']->attributes['uidNumber'][0]*2+1000; } - $this->attributes['smbHome'][0] = str_replace('$user', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['uid'][0], $this->attributes['smbHome'][0]); - $this->attributes['smbHome'][0] = str_replace('$group', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['gid'][0], $this->attributes['smbHome'][0]); + $this->attributes['smbHome'][0] = str_replace('$user', $_SESSION[$this->base]->module['posixAccount']->attributes['uid'][0], $this->attributes['smbHome'][0]); + $this->attributes['smbHome'][0] = str_replace('$group', $_SESSION['cache']->getgrnam($_SESSION[$this->base]->module['posixAccount']->attributes['gidNumber'][0]), $this->attributes['smbHome'][0]); if ($this->attributes['smbHome'][0] != stripslashes($post['smbHome'])) $triggered_messages['smbHome'][] = $this->messages['homePath'][1]; - $this->attributes['scriptPath'][0] = str_replace('$user', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['uid'][0], $this->attributes['scriptPath'][0]); - $this->attributes['scriptPath'][0] = str_replace('$group', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['gid'][0], $this->attributes['scriptPath'][0]); + $this->attributes['scriptPath'][0] = str_replace('$user', $_SESSION[$this->base]->module['posixAccount']->attributes['uid'][0], $this->attributes['scriptPath'][0]); + $this->attributes['scriptPath'][0] = str_replace('$group', $_SESSION['cache']->getgrnam($_SESSION[$this->base]->module['posixAccount']->attributes['gidNumber'][0]), $this->attributes['scriptPath'][0]); if ($this->attributes['scriptPath'][0] != stripslashes($post['scriptPath'])) $triggered_messages['scriptPath'][] = $this->messages['logonScript'][1]; - $this->attributes['profilePath'][0] = str_replace('$user', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['uid'][0], $this->attributes['profilePath'][0]); - $this->attributes['profilePath'][0] = str_replace('$group', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['gid'][0], $this->attributes['profilePath'][0]); + $this->attributes['profilePath'][0] = str_replace('$user', $_SESSION[$this->base]->module['posixAccount']->attributes['uid'][0], $this->attributes['profilePath'][0]); + $this->attributes['profilePath'][0] = str_replace('$group', $_SESSION['cache']->getgrnam($_SESSION[$this->base]->module['posixAccount']->attributes['gidNumber'][0]), $this->attributes['profilePath'][0]); if ($this->attributes['profiletPath'][0] != stripslashes($post['profilePath'])) $triggered_messages['profilePath'][] = $this->messages['profilePath'][1]; if ( (!$this->attributes['smbHome'][0]=='') && (!get_preg($this->attributes['smbHome'][0], 'UNC'))) - $triggered_messages['smbHome'][] = $this->messages['homedir'][0]; + $triggered_messages['smbHome'][] = $this->messages['homePath'][0]; if ( (!$this->attributes['scriptPath'][0]=='') && (!get_preg($this->attributes['scriptPath'][0], 'logonscript'))) $triggered_messages['scriptPath'][] = $this->messages['logonScript'][0]; if ( (!$this->attributes['profilePath'][0]=='') && (!get_preg($this->attributes['profilePath'][0], 'UNC'))) $triggered_messages['profilePath'][] = $this->messages['profilePath'][0]; } + // check values for host account else { - $smbHome = str_replace('$user', 'user', $this->attributes['smbHome'][0]); - $smbHome = str_replace('$group', 'group', $smbHome); - $scriptPath = str_replace('$user', 'user', $this->attributes['scriptPath'][0]); - $scriptPath = str_replace('$group', 'group', $scriptPath); - $profilePath = str_replace('$user', 'user', $this->attributes['profilePath'][0]); - $profilePath = str_replace('$group', 'group', $profilePath); - if ( (!$smbHome=='') && (!get_preg($smbHome, 'UNC'))) - $triggered_messages['smbHome'][] = $this->messages['homePath'][0]; - if ( (!$scriptPath=='') && (!get_preg($scriptPath, 'logonscript'))) - $triggered_messages['scriptPath'][] = $this->messages['logonScript'][0]; - if ( (!$profilePath=='') && (!get_preg('^[/][a-z]([a-z]|[0-9]|[.]|[-]|[_]|[%])*([/][a-z]([a-z]|[0-9]|[.]|[-]|[_]|[%])*)*$', $profilePath)) - && (!get_preg($profilePath, 'UNC'))) - $triggered_messages['profilePath'][] = $this->messages['profilePath'][0]; + if (!$this->attributes['rid'][0]) { + $this->attributes['rid'][0] = ($_SESSION[$this->base]->module['posixAccount']->attributes['uidNumber'][0] * 2) + 1000; } + if (!$this->attributes['primaryGroupID'][0]) { + $this->attributes['primaryGroupID'][0] = ($_SESSION[$this->base]->module['posixAccount']->attributes['gidNumber'][0] * 2) + 1001; + } + } if ((!$this->attributes['domain'][0]=='') && !get_preg($this->attributes['domain'][0], 'domainname')) $triggered_messages['domain'][] = $this->messages['domain'][0]; @@ -778,12 +772,9 @@ class sambaAccount extends baseModule { if ($_SESSION[$this->base]->type=='host') { $return[] = array ( 0 => array ( 'kind' => 'input', 'name' => 'acctFlagsW', 'type' => 'hidden', 'value' => 'true' )); $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Reset password') ), - 1 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'ResetSambaPassword'), + 1 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'ResetSambaPassword', 'value' => _('Submit')), 2 => array ( 'kind' => 'help', 'value' => 'ResetSambaPassword' )); } - $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Domain') ), - 1 => array ( 'kind' => 'input', 'type' => 'text', 'name' => 'domain', 'size' => '20', 'maxlength' => '255', 'value' => $this->attributes['domain'][0]), - 2 => array ( 'kind' => 'help', 'value' => 'domain' )); return $return; } @@ -831,7 +822,6 @@ class sambaAccount extends baseModule { */ function get_pdfEntries($account_type = "user") { return array( 'sambaAccount_displayName' => array('' . _('Display name') . 'attributes['displayName'][0] . ''), - 'sambaAccount_uid' => array('' . _('User name') . '' . $this->attributes['uid'][0] . ''), 'sambaAccount_smbHome' => array('' . _('Home path') . '' . $this->attributes['smbHome'][0] . ''), 'sambaAccount_homeDrive' => array('' . _('Home drive') . '' . $this->attributes['homePath'][0] . ''), 'sambaAccount_scriptPath' => array('' . _('Logon script') . '' . $this->attributes['scriptPath'][0] . ''), diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc index 3dc27d5f..36fa5302 100644 --- a/lam/lib/modules/sambaSamAccount.inc +++ b/lam/lib/modules/sambaSamAccount.inc @@ -482,9 +482,11 @@ class sambaSamAccount extends baseModule { if ($_SESSION[$this->base]->type=='host') { $this->attributes['sambaPrimaryGroupSID'][0] = $SID."-".$this->rids[_('Domain Computers')]; - if ($post['ResetSambaPassword']) { - $this->attributes['sambaLMPassword'][0] = lmPassword($_SESSION[$this->base]->module['posixAccount']->attributes['uid'][0]); - $this->attributes['sambaNTPassword'][0] = ntPassword($_SESSION[$this->base]->module['posixAccount']->attributes['uid'][0]); + if ($post['ResetSambaPassword'] || !$this->attributes['sambaLMPassword'][0]) { + $hostname = $_SESSION[$this->base]->module['posixAccount']->attributes['uid'][0]; + $hostname = substr($hostname, 0, strlen($hostname) - 1); + $this->attributes['sambaLMPassword'][0] = lmPassword($hostname); + $this->attributes['sambaNTPassword'][0] = ntPassword($hostname); $this->attributes['sambaPwdLastSet'][0] = time(); } } @@ -558,14 +560,14 @@ class sambaSamAccount extends baseModule { $this->attributes['sambaSID'][0] = $SID."-". (($_SESSION[$this->base]->module['posixAccount']->attributes['uidNumber'][0]*2)+$RIDbase); } // Check values - $this->attributes['sambaHomePath'][0] = str_replace('$user', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['uid'][0], $this->attributes['sambaHomePath'][0]); - $this->attributes['sambaHomePath'][0] = str_replace('$group', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['gid'][0], $this->attributes['sambaHomePath'][0]); + $this->attributes['sambaHomePath'][0] = str_replace('$user', $_SESSION[$this->base]->module['posixAccount']->attributes['uid'][0], $this->attributes['sambaHomePath'][0]); + $this->attributes['sambaHomePath'][0] = str_replace('$group', $_SESSION['cache']->getgrnam($_SESSION[$this->base]->module['posixAccount']->attributes['gidNumber'][0]), $this->attributes['sambaHomePath'][0]); if ($this->attributes['sambaHomePath'][0] != stripslashes($post['sambaHomePath'])) $triggered_messages['sambaHomePath'][] = $this->messages['homePath'][1]; - $this->attributes['sambaLogonScript'][0] = str_replace('$user', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['uid'][0], $this->attributes['sambaLogonScript'][0]); - $this->attributes['sambaLogonScript'][0] = str_replace('$group', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['gid'][0], $this->attributes['sambaLogonScript'][0]); + $this->attributes['sambaLogonScript'][0] = str_replace('$user', $_SESSION[$this->base]->module['posixAccount']->attributes['uid'][0], $this->attributes['sambaLogonScript'][0]); + $this->attributes['sambaLogonScript'][0] = str_replace('$group', $_SESSION['cache']->getgrnam($_SESSION[$this->base]->module['posixAccount']->attributes['gidNumber'][0]), $this->attributes['sambaLogonScript'][0]); if ($this->attributes['sambaLogonScript'][0] != stripslashes($post['sambaLogonScript'])) $triggered_messages['sambaLogonScript'][] = $this->messages['logonScript'][1]; - $this->attributes['sambaProfilePath'][0] = str_replace('$user', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['uid'][0], $this->attributes['sambaProfilePath'][0]); - $this->attributes['sambaProfilePath'][0] = str_replace('$group', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['gid'][0], $this->attributes['sambaProfilePath'][0]); + $this->attributes['sambaProfilePath'][0] = str_replace('$user', $_SESSION[$this->base]->module['posixAccount']->attributes['uid'][0], $this->attributes['sambaProfilePath'][0]); + $this->attributes['sambaProfilePath'][0] = str_replace('$group', $_SESSION['cache']->getgrnam($_SESSION[$this->base]->module['posixAccount']->attributes['gidNumber'][0]), $this->attributes['sambaProfilePath'][0]); if ($this->attributes['sambaProfilePath'][0] != stripslashes($post['sambaProfilePath'])) $triggered_messages['sambaProfilePath'][] = $this->messages['profilePath'][1]; if ( (!$this->attributes['sambaHomePath'][0]=='') && (!get_preg($this->attributes['sambaHomePath'][0], 'UNC'))) $triggered_messages['sambaHomePath'][] = $this->messages['homePath'][0]; @@ -574,22 +576,12 @@ class sambaSamAccount extends baseModule { if (!($this->attributes['sambaProfilePath'][0] == '') && !(get_preg($this->attributes['sambaProfilePath'][0], 'UNC') xor get_preg($this->attributes['sambaProfilePath'][0], 'homeDirectory'))) $triggered_messages['sambaProfilePath'][] = $this->messages['profilePath'][0]; + } + else { // host + if (!$this->attributes['sambaSID'][0]) { + $this->attributes['sambaSID'][0] = $SID."-". (($_SESSION[$this->base]->module['posixAccount']->attributes['uidNumber'][0]*2)+$RIDbase); } - else { - $sambaHomePath = str_replace('$user', 'user', $this->attributes['sambaHomePath'][0]); - $sambaHomePath = str_replace('$group', 'group', $sambaHomePath); - $sambaLogonScript = str_replace('$user', 'user', $this->attributes['sambaLogonScript'][0]); - $sambaLogonScript = str_replace('$group', 'group', $sambaLogonScript); - $sambaProfilePath = str_replace('$user', 'user', $this->attributes['sambaProfilePath'][0]); - $sambaProfilePath = str_replace('$group', 'group', $sambaProfilePath); - if ( (!$this->attributes['sambaHomePath'][0]=='') && (!get_preg($this->attributes['sambaHomePath'][0], 'UNC'))) - $triggered_messages[] = $this->messages['homePath'][0]; - if ( (!$this->attributes['sambaLogonScript'][0]=='') && (!get_preg($this->attributes['sambaLogonScript'][0], 'logonscript'))) - $triggered_messages[] = $this->messages['logonScript'][0]; - if ( (!$this->attributes['sambaProfilePath'][0]=='') && (!get_preg($this->attributes['sambaProfilePath'][0], 'UNC')) - && (!get_preg($this->attributes['sambaProfilePath'][0], 'UNC'))) - $triggered_messages[] = $this->messages['profilePath'][0]; - } + } if (count($triggered_messages)!=0) { $this->triggered_messages = $triggered_messages; return $triggered_messages; @@ -766,11 +758,8 @@ class sambaSamAccount extends baseModule { if ($_SESSION[$this->base]->type=='host') { $return[] = array ( 0 => array ( 'kind' => 'input', 'name' => 'sambaAcctFlagsW', 'type' => 'hidden', 'value' => 'true' )); $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Reset password') ), - 1 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'ResetSambaPassword'), + 1 => array ( 'kind' => 'input', 'type' => 'submit', 'name' => 'ResetSambaPassword', 'value' => _('Submit')), 2 => array ( 'kind' => 'help', 'value' => 'ResetSambaPassword' )); - $return[] = array ( 0 => array ( 'kind' => 'text', 'text' => _('Domain') ), - 1 => array ( 'kind' => 'select', 'name' => 'sambaDomainName', 'options' => $sambaDomainNames, 'options_selected' => $this->attributes['sambaDomainName'][0]), - 2 => array ( 'kind' => 'help', 'value' => 'sambaDomainName' )); } return $return; }