From 44c595e12d7c4a5b4d8252edb59eccb6cca5d8fb Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 13 Mar 2015 13:51:32 +0000 Subject: [PATCH] * Univention: Samba SID was not propagated to config of SambaAdmin app --- doc/rpm-build/post_install.php | 6 +++--- setup/inc/class.setup_cmd_config.inc.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php index 6eb899757a..15822330ed 100755 --- a/doc/rpm-build/post_install.php +++ b/doc/rpm-build/post_install.php @@ -56,7 +56,7 @@ $config = array( 'ldap_search_filter' => '(uid=%user)', 'ldap_group_context' => 'ou=groups,$base', 'ldap_encryption_type' => '', - 'sambaadmin/sambaSID'=> '', // SID for sambaadmin + 'sambaadmin/sambasid'=> '', // SID for sambaadmin 'mailserver' => '', 'smtpserver' => 'localhost,25', 'smtp' => '', // see setup-cli.php --help config @@ -300,7 +300,7 @@ if (!file_exists($config['header']) || filesize($config['header']) < 200) // def foreach(array( '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_encryption_type', 'sambaadmin/sambaSID', + 'ldap_encryption_type', 'sambaadmin/sambasid', ) as $name) { if (strpos($value=$config[$name],'$') !== false) @@ -636,7 +636,7 @@ function set_univention_defaults() $config['account-auth'] = 'univention,ldap'; // 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 if (($mailserver = exec('/usr/bin/univention-ldapsearch -x "(univentionAppID=mailserver_*)" univentionAppInstalledOnServer|sed -n "s/univentionAppInstalledOnServer: \(.*\)/\1/p"')) && diff --git a/setup/inc/class.setup_cmd_config.inc.php b/setup/inc/class.setup_cmd_config.inc.php index 0e2fd4b49f..b82e4963e1 100644 --- a/setup/inc/class.setup_cmd_config.inc.php +++ b/setup/inc/class.setup_cmd_config.inc.php @@ -199,7 +199,7 @@ class setup_cmd_config extends setup_cmd '--ldap-context' => 'ldap_context', '--ldap-search-filter' => 'ldap_search_filter', '--ldap-group-context' => 'ldap_group_context', - '--sambaadmin-sid' => 'sambaadmin/sambaSID', + '--sambaadmin-sid' => 'sambaadmin/sambasid', '--allow-remote-admin' => 'allow_remote_admin', '--install-id' => 'install_id', '--ads-host' => 'ads_host',