summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2019-04-07 20:41:32 +0200
committerSlávek Banko <[email protected]>2019-04-07 20:41:32 +0200
commitc9177222da536b05576f268f60896f40cb8a954c (patch)
tree30cd5256bc14c0094f32fd9659009bb3777514dc
parent9ee976924cf2add4b3ce7cc80d47606dcebf50ea (diff)
downloadkcmldapcontroller-c9177222da536b05576f268f60896f40cb8a954c.tar.gz
kcmldapcontroller-c9177222da536b05576f268f60896f40cb8a954c.zip
Added controlled conversions to char* instead of automatic ascii conversions.
Signed-off-by: Slávek Banko <[email protected]>
-rw-r--r--cert-updater/main.cpp2
-rw-r--r--src/ldapcontroller.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/cert-updater/main.cpp b/cert-updater/main.cpp
index c4be86d..8a490f9 100644
--- a/cert-updater/main.cpp
+++ b/cert-updater/main.cpp
@@ -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);
diff --git a/src/ldapcontroller.cpp b/src/ldapcontroller.cpp
index 9467b61..cff47cc 100644
--- a/src/ldapcontroller.cpp
+++ b/src/ldapcontroller.cpp
@@ -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;