index d997499044573ea5ae6be8f7aa8282cb38d28703..481da05236d2f7d39cdca2c3e8db040025fd97ab 100644 (file)
/* Trigger on CONF section */
if ($tag == 'CONF'){
$this->config_found= TRUE;
- if(isset($attrs['CONFIG_VERSION'])){
+ if(isset($attrs['CONFIGVERSION'])){
$this->config_version = $attrs['CONFIGVERSION'];
}
}
if (!isset($this->current['SAMBAVERSION'])){
$this->current['SAMBAVERSION']= 3;
}
- if (!isset($this->current['PEOPLE'])){
- $this->current['PEOPLE']= "ou=people";
+ if (!isset($this->current['USERRDN'])){
+ $this->current['USERRDN']= "ou=people";
}
if (!isset($this->current['GROUPS'])){
$this->current['GROUPS']= "ou=groups";
/* Remove possibly added ',' from end of group and people ou */
$this->current['GROUPS'] = preg_replace("/,*$/","",$this->current['GROUPS']);
- $this->current['PEOPLE'] = preg_replace("/,*$/","",$this->current['PEOPLE']);
+ $this->current['USERRDN'] = preg_replace("/,*$/","",$this->current['USERRDN']);
if (!isset($this->current['WINSTATIONS'])){
$this->current['WINSTATIONS']= "ou=winstations,ou=systems";
if (!isset($this->current['HASH'])){
$this->current['HASH']= "crypt";
}
- if (!isset($this->current['DNMODE'])){
- $this->current['DNMODE']= "cn";
+ if (!isset($this->current['ACCOUNTPRIMARYATTRIBUTE'])){
+ $this->current['ACCOUNTPRIMARYATTRIBUTE']= "cn";
}
if (!isset($this->current['MINID'])){
$this->current['MINID']= 100;
$ldap->search ("(objectClass=goLogDBServer)");
if ($ldap->count()){
$attrs= $ldap->fetch();
+ if(!isset($attrs['goLogDB'][0])){
+ $attrs['goLogDB'][0] = "gomon";
+ }
$this->data['SERVERS']['LOG']= array( 'SERVER' => $attrs['cn'][0],
'LOGIN' => $attrs['goLogAdmin'][0],
+ 'DB' => $attrs['goLogDB'][0],
'PASSWORD' => $attrs['goLogPassword'][0]);
}
*/
function check_session_lifetime()
{
- $cfg_lifetime = $this->data['MAIN']['SESSION_LIFETIME'];
+ $cfg_lifetime = $this->data['MAIN']['SESSIONLIFETIME'];
$ini_lifetime = ini_get('session.gc_maxlifetime');
$deb_system = file_exists('/etc/debian_version');
return(!($deb_system && ($ini_lifetime < $cfg_lifetime)));