Added controlled conversions to char* instead of automatic ascii conversions.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
r14.0.x
Slávek Banko 5 years ago
parent 9ee976924c
commit c9177222da
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -196,7 +196,7 @@ int main(int argc, char *argv[])
LDAPCredentials* credentials = new LDAPCredentials;
credentials->username = "cn=admin," + basedn;
m_systemconfig->setGroup("Replication");
credentials->password = m_systemconfig->readEntry("Password");
credentials->password = m_systemconfig->readEntry("Password").utf8();
m_systemconfig->setGroup(NULL);
credentials->realm = realmname;
LDAPManager* ldap_mgr = new LDAPManager(realmname, TQString("ldaps://%1/").arg(realmCAMaster), credentials);

@ -977,7 +977,7 @@ void LDAPController::save() {
// Use the local password for inter-master authentication
// All realm controllers in a realm must (obviously) use the same admin/config password!
m_systemconfig->setGroup("Replication");
replicationSettings.syncPassword = m_systemconfig->readEntry("Password");
replicationSettings.syncPassword = m_systemconfig->readEntry("Password").utf8();
m_systemconfig->setGroup(NULL);
// Use the TDE LDAP CA for replication TLS
replicationSettings.caCertificateFile = KERBEROS_PKI_PEM_FILE;

Loading…
Cancel
Save