extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 19:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Univention: Samba SID was not propagated to config of SambaAdmin app

Browse Source
This commit is contained in:
Ralf Becker 2015-03-13 13:51:10 +00:00
parent 386ee978f3
commit 61cf8fa9f5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/rpm-build/post_install.php
View File

@ -56,7 +56,7 @@ $config = array(
'ldap_search_filter' => '(uid=%user)', 'ldap_search_filter' => '(uid=%user)',
'ldap_group_context' => 'ou=groups,$base', 'ldap_group_context' => 'ou=groups,$base',
'ldap_encryption_type' => '', 'ldap_encryption_type' => '',
'sambaadmin/sambaSID'=> '', // SID for sambaadmin 'sambaadmin/sambasid'=> '', // SID for sambaadmin
'mailserver' => '', 'mailserver' => '',
'smtpserver' => 'localhost,25', 'smtpserver' => 'localhost,25',
'smtp' => '', // see setup-cli.php --help config 'smtp' => '', // see setup-cli.php --help config
@ -300,7 +300,7 @@ if (!file_exists($config['header']) || filesize($config['header']) < 200) // def
foreach(array( foreach(array(
'domain','ldap_suffix','ldap_host','ldap_admin','ldap_admin_pw', // non-egw params: only used for create 'domain','ldap_suffix','ldap_host','ldap_admin','ldap_admin_pw', // non-egw params: only used for create
'ldap_base','ldap_root_dn','ldap_root_pw','ldap_context','ldap_search_filter','ldap_group_context', // egw params 'ldap_base','ldap_root_dn','ldap_root_pw','ldap_context','ldap_search_filter','ldap_group_context', // egw params
'ldap_encryption_type', 'sambaadmin/sambaSID', 'ldap_encryption_type', 'sambaadmin/sambasid',
) as $name) ) as $name)
{ {
if (strpos($value=$config[$name],'$') !== false) if (strpos($value=$config[$name],'$') !== false)
@ -636,7 +636,7 @@ function set_univention_defaults()
$config['account-auth'] = 'univention,ldap'; $config['account-auth'] = 'univention,ldap';
// set sambaadmin sambaSID // set sambaadmin sambaSID
$config['sambaadmin/sambaSID'] = exec('/usr/bin/univention-ldapsearch -x "(objectclass=sambadomain)" sambaSID|sed -n "s/sambaSID: \(.*\)/\1/p"'); $config['sambaadmin/sambasid'] = exec('/usr/bin/univention-ldapsearch -x "(objectclass=sambadomain)" sambaSID|sed -n "s/sambaSID: \(.*\)/\1/p"');
// mailserver, see setup-cli.php --help config // mailserver, see setup-cli.php --help config
if (($mailserver = exec('/usr/bin/univention-ldapsearch -x "(univentionAppID=mailserver_*)" univentionAppInstalledOnServer|sed -n "s/univentionAppInstalledOnServer: \(.*\)/\1/p"')) && if (($mailserver = exec('/usr/bin/univention-ldapsearch -x "(univentionAppID=mailserver_*)" univentionAppInstalledOnServer|sed -n "s/univentionAppInstalledOnServer: \(.*\)/\1/p"')) &&

2
setup/inc/class.setup_cmd_config.inc.php
View File

@ -199,7 +199,7 @@ class setup_cmd_config extends setup_cmd
'--ldap-context' => 'ldap_context', '--ldap-context' => 'ldap_context',
'--ldap-search-filter' => 'ldap_search_filter', '--ldap-search-filter' => 'ldap_search_filter',
'--ldap-group-context' => 'ldap_group_context', '--ldap-group-context' => 'ldap_group_context',
'--sambaadmin-sid' => 'sambaadmin/sambaSID', '--sambaadmin-sid' => 'sambaadmin/sambasid',
'--allow-remote-admin' => 'allow_remote_admin', '--allow-remote-admin' => 'allow_remote_admin',
'--install-id' => 'install_id', '--install-id' => 'install_id',
'--ads-host' => 'ads_host', '--ads-host' => 'ads_host',