From 123de33960f6667942a71bd73cc0b39d036415f6 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 2 Dec 2018 17:21:52 +0900 Subject: More changes for bug 2961. Signed-off-by: Michele Calgaro --- src/libtdeldap.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/libtdeldap.h') diff --git a/src/libtdeldap.h b/src/libtdeldap.h index 9121c45..e75d94d 100644 --- a/src/libtdeldap.h +++ b/src/libtdeldap.h @@ -176,7 +176,7 @@ class LDAPCredentials public: TQString username; - TQCString password; + TQString password; TQString realm; bool use_tls; bool use_gssapi; @@ -292,7 +292,7 @@ class LDAPUserInfo gid_t primary_gid; bool tde_builtin_account; LDAPKRB5Flags status; // Default active user is 586 [KRB5_ACTIVE_DEFAULT] and locked out user is 7586 [KRB5_DISABLED_ACCOUNT] - TQCString new_password; + TQString new_password; TQDateTime account_created; TQDateTime account_modified; TQDateTime password_last_changed; @@ -450,7 +450,7 @@ class LDAPMasterReplicationInfo int timeout; int syncMethod; TQString syncDN; - TQCString syncPassword; + TQString syncPassword; TQString certificateFile; TQString caCertificateFile; bool ignore_ssl_failure; @@ -589,8 +589,10 @@ class LDAPManager : public TQObject { static int writePAMFiles(LDAPPamConfig pamConfig, TQString *errstr=0); static bool pkcsLoginEnabled(); - static int bondRealm(TQString adminUserName, const char * adminPassword, TQString adminRealm, TQString *errstr=0); - static int unbondRealm(LDAPRealmConfig realmcfg, TQString adminUserName, const char * adminPassword, TQString adminRealm, TQString *errstr=0); + static int bondRealm(const TQString &adminUserName, const TQString &adminPassword, + const TQString &adminRealm, TQString *errstr=0); + static int unbondRealm(LDAPRealmConfig realmcfg, const TQString &adminUserName, + const TQString &adminPassword, const TQString &adminRealm, TQString *errstr=0); private: int bindKAdmin(LDAPCredentials *administrativeCredentials=NULL, TQString *errstr=0); -- cgit v1.2.1