TDE
/
kcmldapcontroller
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kcmldapcontroller
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source 
The definition of -UTQT_NO_ASCII_CAST is no longer needed.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit fd16b36405)
r14.0.x
Slávek Banko 5 years ago
parent 0dd8294973
commit 77208228c9
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
5 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape View File

@ -70,8 +70,8 @@ include( ConfigureChecks.cmake )
###### global compiler settings ###### global compiler settings
add_definitions( -DHAVE_CONFIG_H -UQT_NO_ASCII_CAST ) add_definitions( -DHAVE_CONFIG_H )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )

2
cert-updater/main.cpp
Unescape View File

@ -289,7 +289,7 @@ int main(int argc, char *argv[])
// Get LDAP user uid/gid // Get LDAP user uid/gid
struct passwd *pwd; struct passwd *pwd;
pwd = getpwnam(m_ldapUserName); pwd = getpwnam(m_ldapUserName.local8Bit());
slapd_uid = pwd->pw_uid; slapd_uid = pwd->pw_uid;
slapd_gid = pwd->pw_gid; slapd_gid = pwd->pw_gid;

52
src/ldapcontroller.cpp
Unescape View File

@ -314,8 +314,8 @@ void LDAPController::systemRoleChanged() {
pdialog.setStatusMessage(i18n("Purging local configuration...")); pdialog.setStatusMessage(i18n("Purging local configuration..."));
tqApp->processEvents(); tqApp->processEvents();
system_safe(TQString("rm -f %1").arg(CRON_UPDATE_PRIMARY_REALM_CERTIFICATES_FILE)); system_safe(TQString("rm -f %1").arg(CRON_UPDATE_PRIMARY_REALM_CERTIFICATES_FILE).local8Bit());
system_safe(TQString("rm -rf %1").arg(TDE_CERTIFICATE_DIR)); system_safe(TQString("rm -rf %1").arg(TDE_CERTIFICATE_DIR).local8Bit());
// Write the TDE realm configuration file // Write the TDE realm configuration file
LDAPRealmConfigList realms; LDAPRealmConfigList realms;
@ -682,7 +682,7 @@ void LDAPController::btnldapRegenerate() {
// Get LDAP user uid/gid // Get LDAP user uid/gid
struct passwd *pwd; struct passwd *pwd;
pwd = getpwnam(m_ldapUserName); pwd = getpwnam(m_ldapUserName.local8Bit());
slapd_uid = pwd->pw_uid; slapd_uid = pwd->pw_uid;
slapd_gid = pwd->pw_gid; slapd_gid = pwd->pw_gid;
@ -758,7 +758,7 @@ void LDAPController::btnChangeLDAPRootPassword() {
} }
} }
ifile.close(); ifile.close();
unlink(oldconfigfilename); unlink(oldconfigfilename.local8Bit());
ofile.close(); ofile.close();
if (controlLDAPServer(SC_START) == 0) { if (controlLDAPServer(SC_START) == 0) {
ret = true; ret = true;
@ -1145,7 +1145,7 @@ int LDAPController::controlHeimdalServer(sc_command command, uid_t userid, gid_t
} }
if (command == SC_PURGE) { if (command == SC_PURGE) {
controlHeimdalServer(SC_STOP); controlHeimdalServer(SC_STOP);
system_safe("rm -f " + TQString(LDAP_KEYTAB_FILE)); system_safe(TQString("rm -f %1").arg(LDAP_KEYTAB_FILE).local8Bit());
// FIXME // FIXME
// This assumes Debian // This assumes Debian
system_safe("rm -f /etc/krb5.keytab"); system_safe("rm -f /etc/krb5.keytab");
@ -1215,7 +1215,7 @@ int LDAPController::initializeNewKerberosRealm(TQString realmName, TQString *err
prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc); prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
prompt = prompt.stripWhiteSpace(); prompt = prompt.stripWhiteSpace();
if (prompt == "kadmin>") { if (prompt == "kadmin>") {
command = TQCString("init "+realmName); command = TQCString("init ")+realmName.local8Bit();
kadminProc.enableLocalEcho(false); kadminProc.enableLocalEcho(false);
kadminProc.writeLine(command, true); kadminProc.writeLine(command, true);
do { // Discard our own input do { // Discard our own input
@ -1285,7 +1285,7 @@ int LDAPController::addHostEntryToKerberosRealm(TQString kerberosHost, TQString
prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc); prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
prompt = prompt.stripWhiteSpace(); prompt = prompt.stripWhiteSpace();
if (prompt == "kadmin>") { if (prompt == "kadmin>") {
command = TQCString("ext "+hoststring); command = TQCString("ext ")+hoststring.local8Bit();
kadminProc.enableLocalEcho(false); kadminProc.enableLocalEcho(false);
kadminProc.writeLine(command, true); kadminProc.writeLine(command, true);
do { // Discard our own input do { // Discard our own input
@ -1308,7 +1308,7 @@ int LDAPController::addHostEntryToKerberosRealm(TQString kerberosHost, TQString
kadminProc.writeLine("quit", true); kadminProc.writeLine("quit", true);
return 1; return 1;
} }
command = TQCString("ank --random-key "+hoststring); command = TQCString("ank --random-key ")+hoststring.local8Bit();
kadminProc.enableLocalEcho(false); kadminProc.enableLocalEcho(false);
kadminProc.writeLine(command, true); kadminProc.writeLine(command, true);
do { // Discard our own input do { // Discard our own input
@ -1333,7 +1333,7 @@ int LDAPController::addHostEntryToKerberosRealm(TQString kerberosHost, TQString
leftbracket++; leftbracket++;
defaultParam = prompt.mid(leftbracket, rightbracket-leftbracket); defaultParam = prompt.mid(leftbracket, rightbracket-leftbracket);
} }
command = TQCString(defaultParam); command = defaultParam.local8Bit();
kadminProc.enableLocalEcho(false); kadminProc.enableLocalEcho(false);
kadminProc.writeLine(command, true); kadminProc.writeLine(command, true);
do { // Discard our own input do { // Discard our own input
@ -1343,7 +1343,7 @@ int LDAPController::addHostEntryToKerberosRealm(TQString kerberosHost, TQString
prompt = prompt.stripWhiteSpace(); prompt = prompt.stripWhiteSpace();
} }
} }
command = TQCString("ext "+hoststring); command = TQCString("ext ")+hoststring.local8Bit();
kadminProc.enableLocalEcho(false); kadminProc.enableLocalEcho(false);
kadminProc.writeLine(command, true); kadminProc.writeLine(command, true);
do { // Discard our own input do { // Discard our own input
@ -1394,7 +1394,7 @@ int LDAPController::addLDAPEntryToKerberosRealm(TQString ldapProcessOwnerName, T
prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc); prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
prompt = prompt.stripWhiteSpace(); prompt = prompt.stripWhiteSpace();
if (prompt == "kadmin>") { if (prompt == "kadmin>") {
command = TQCString("ext --keytab="+TQString(LDAP_KEYTAB_FILE)+" "+hoststring); command = TQCString("ext --keytab=")+LDAP_KEYTAB_FILE+" "+hoststring.local8Bit();
kadminProc.enableLocalEcho(false); kadminProc.enableLocalEcho(false);
kadminProc.writeLine(command, true); kadminProc.writeLine(command, true);
do { // Discard our own input do { // Discard our own input
@ -1417,7 +1417,7 @@ int LDAPController::addLDAPEntryToKerberosRealm(TQString ldapProcessOwnerName, T
kadminProc.writeLine("quit", true); kadminProc.writeLine("quit", true);
return 1; return 1;
} }
command = TQCString("ank --random-key "+hoststring); command = TQCString("ank --random-key ")+hoststring.local8Bit();
kadminProc.enableLocalEcho(false); kadminProc.enableLocalEcho(false);
kadminProc.writeLine(command, true); kadminProc.writeLine(command, true);
do { // Discard our own input do { // Discard our own input
@ -1442,7 +1442,7 @@ int LDAPController::addLDAPEntryToKerberosRealm(TQString ldapProcessOwnerName, T
leftbracket++; leftbracket++;
defaultParam = prompt.mid(leftbracket, rightbracket-leftbracket); defaultParam = prompt.mid(leftbracket, rightbracket-leftbracket);
} }
command = TQCString(defaultParam); command = defaultParam.local8Bit();
kadminProc.enableLocalEcho(false); kadminProc.enableLocalEcho(false);
kadminProc.writeLine(command, true); kadminProc.writeLine(command, true);
do { // Discard our own input do { // Discard our own input
@ -1452,7 +1452,7 @@ int LDAPController::addLDAPEntryToKerberosRealm(TQString ldapProcessOwnerName, T
prompt = prompt.stripWhiteSpace(); prompt = prompt.stripWhiteSpace();
} }
} }
command = TQCString("ext --keytab="+TQString(LDAP_KEYTAB_FILE)+" "+hoststring); command = TQCString("ext --keytab=")+LDAP_KEYTAB_FILE+" "+hoststring.local8Bit();
kadminProc.enableLocalEcho(false); kadminProc.enableLocalEcho(false);
kadminProc.writeLine(command, true); kadminProc.writeLine(command, true);
do { // Discard our own input do { // Discard our own input
@ -1497,7 +1497,7 @@ int LDAPController::setKerberosPasswordForUser(LDAPCredentials user, TQString *e
TQCString command = "kadmin"; TQCString command = "kadmin";
QCStringList args; QCStringList args;
args << TQCString("-l") << TQCString("-r") << TQCString(user.realm.upper()); args << TQCString("-l") << TQCString("-r") << user.realm.upper().local8Bit();
TQString prompt; TQString prompt;
PtyProcess kadminProc; PtyProcess kadminProc;
@ -1505,7 +1505,7 @@ int LDAPController::setKerberosPasswordForUser(LDAPCredentials user, TQString *e
prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc); prompt = LDAPManager::readFullLineFromPtyProcess(&kadminProc);
prompt = prompt.stripWhiteSpace(); prompt = prompt.stripWhiteSpace();
if (prompt == "kadmin>") { if (prompt == "kadmin>") {
command = TQCString("passwd "+user.username); command = TQCString("passwd ")+user.username.local8Bit();
kadminProc.enableLocalEcho(false); kadminProc.enableLocalEcho(false);
kadminProc.writeLine(command, true); kadminProc.writeLine(command, true);
do { // Discard our own input do { // Discard our own input
@ -1570,7 +1570,7 @@ int LDAPController::createRealmCertificates(LDAPCertConfig certinfo, LDAPRealmCo
// Certificate authority certificate // Certificate authority certificate
TQString command; TQString command;
command = TQString("openssl genrsa -out %1 %2").arg(KERBEROS_PKI_PEMKEY_FILE).arg(KEY_STRENGTH); command = TQString("openssl genrsa -out %1 %2").arg(KERBEROS_PKI_PEMKEY_FILE).arg(KEY_STRENGTH);
system_safe(command); system_safe(command.local8Bit());
chmod(KERBEROS_PKI_PEMKEY_FILE, S_IRUSR|S_IWUSR); chmod(KERBEROS_PKI_PEMKEY_FILE, S_IRUSR|S_IWUSR);
chown_safe(KERBEROS_PKI_PEMKEY_FILE, 0, 0); chown_safe(KERBEROS_PKI_PEMKEY_FILE, 0, 0);
@ -1584,7 +1584,7 @@ int LDAPController::createRealmCertificates(LDAPCertConfig certinfo, LDAPRealmCo
kdc_keyfile.replace("@@@KDCSERVER@@@", realmconfig.name.lower()); kdc_keyfile.replace("@@@KDCSERVER@@@", realmconfig.name.lower());
kdc_reqfile.replace("@@@KDCSERVER@@@", realmconfig.name.lower()); kdc_reqfile.replace("@@@KDCSERVER@@@", realmconfig.name.lower());
command = TQString("openssl genrsa -out %1 %2").arg(kdc_keyfile).arg(KEY_STRENGTH); command = TQString("openssl genrsa -out %1 %2").arg(kdc_keyfile).arg(KEY_STRENGTH);
system_safe(command); system_safe(command.local8Bit());
chmod(kdc_keyfile.ascii(), S_IRUSR|S_IWUSR); chmod(kdc_keyfile.ascii(), S_IRUSR|S_IWUSR);
chown_safe(kdc_keyfile.ascii(), 0, 0); chown_safe(kdc_keyfile.ascii(), 0, 0);
@ -1598,7 +1598,7 @@ int LDAPController::createRealmCertificates(LDAPCertConfig certinfo, LDAPRealmCo
ldap_keyfile.replace("@@@ADMINSERVER@@@", realmconfig.name.lower()); ldap_keyfile.replace("@@@ADMINSERVER@@@", realmconfig.name.lower());
ldap_reqfile.replace("@@@ADMINSERVER@@@", realmconfig.name.lower()); ldap_reqfile.replace("@@@ADMINSERVER@@@", realmconfig.name.lower());
command = TQString("openssl genrsa -out %1 %2").arg(ldap_keyfile).arg(KEY_STRENGTH); command = TQString("openssl genrsa -out %1 %2").arg(ldap_keyfile).arg(KEY_STRENGTH);
system_safe(command); system_safe(command.local8Bit());
chmod(ldap_keyfile.ascii(), S_IRUSR|S_IWUSR); chmod(ldap_keyfile.ascii(), S_IRUSR|S_IWUSR);
chown_safe(ldap_keyfile.ascii(), ldap_uid, ldap_gid); chown_safe(ldap_keyfile.ascii(), ldap_uid, ldap_gid);
@ -1808,7 +1808,7 @@ int LDAPController::createNewLDAPRealm(TQWidget* dialogparent, LDAPRealmConfig r
// Get LDAP user uid/gid // Get LDAP user uid/gid
struct passwd *pwd; struct passwd *pwd;
pwd = getpwnam(m_ldapUserName); pwd = getpwnam(m_ldapUserName.local8Bit());
slapd_uid = pwd->pw_uid; slapd_uid = pwd->pw_uid;
slapd_gid = pwd->pw_gid; slapd_gid = pwd->pw_gid;
@ -1893,17 +1893,17 @@ int LDAPController::createNewLDAPRealm(TQWidget* dialogparent, LDAPRealmConfig r
// There has GOT to be a better way to do this than system()!!! // There has GOT to be a better way to do this than system()!!!
TQString command; TQString command;
command = TQString("cp %1 %2").arg(certinfo.provided_kerberos_pem).arg(KERBEROS_PKI_PEMKEY_FILE); command = TQString("cp %1 %2").arg(certinfo.provided_kerberos_pem).arg(KERBEROS_PKI_PEMKEY_FILE);
system_safe(command); system_safe(command.local8Bit());
command = TQString("cp %1 %2").arg(certinfo.provided_kerberos_pemkey).arg(KERBEROS_PKI_PEM_FILE); command = TQString("cp %1 %2").arg(certinfo.provided_kerberos_pemkey).arg(KERBEROS_PKI_PEM_FILE);
system_safe(command); system_safe(command.local8Bit());
command = TQString("cp %1 %2").arg(certinfo.provided_kerberos_crt).arg(kdc_certfile); command = TQString("cp %1 %2").arg(certinfo.provided_kerberos_crt).arg(kdc_certfile);
system_safe(command); system_safe(command.local8Bit());
command = TQString("cp %1 %2").arg(certinfo.provided_kerberos_key).arg(kdc_keyfile); command = TQString("cp %1 %2").arg(certinfo.provided_kerberos_key).arg(kdc_keyfile);
system_safe(command); system_safe(command.local8Bit());
command = TQString("cp %1 %2").arg(certinfo.provided_ldap_crt).arg(ldap_certfile); command = TQString("cp %1 %2").arg(certinfo.provided_ldap_crt).arg(ldap_certfile);
system_safe(command); system_safe(command.local8Bit());
command = TQString("cp %1 %2").arg(certinfo.provided_ldap_key).arg(ldap_keyfile); command = TQString("cp %1 %2").arg(certinfo.provided_ldap_key).arg(ldap_keyfile);
system_safe(command); system_safe(command.local8Bit());
// Set permissions // Set permissions
chmod(KERBEROS_PKI_PEMKEY_FILE, S_IRUSR|S_IWUSR); chmod(KERBEROS_PKI_PEMKEY_FILE, S_IRUSR|S_IWUSR);

8
src/primaryrealmwizard/realmconfigpagedlg.ui
Unescape View File

@ -143,7 +143,7 @@
<string>UID offset</string> <string>UID offset</string>
</property> </property>
<property name="hidden"> <property name="hidden">
<string>true</string> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="KIntNumInput" row="3" column="1" colspan="3"> <widget class="KIntNumInput" row="3" column="1" colspan="3">
@ -157,7 +157,7 @@
<number>99999</number> <number>99999</number>
</property> </property>
<property name="hidden"> <property name="hidden">
<string>true</string> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="TQLabel" row="4" column="0"> <widget class="TQLabel" row="4" column="0">
@ -168,7 +168,7 @@
<string>GID offset</string> <string>GID offset</string>
</property> </property>
<property name="hidden"> <property name="hidden">
<string>true</string> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="KIntNumInput" row="4" column="1" colspan="3"> <widget class="KIntNumInput" row="4" column="1" colspan="3">
@ -182,7 +182,7 @@
<number>99999</number> <number>99999</number>
</property> </property>
<property name="hidden"> <property name="hidden">
<string>true</string> <bool>true</bool>
</property> </property>
</widget> </widget>
</grid> </grid>

8
src/secondaryrealmwizard/realmconfigpagedlg.ui
Unescape View File

@ -143,7 +143,7 @@
<string>UID offset</string> <string>UID offset</string>
</property> </property>
<property name="hidden"> <property name="hidden">
<string>true</string> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="KIntNumInput" row="3" column="1" colspan="3"> <widget class="KIntNumInput" row="3" column="1" colspan="3">
@ -157,7 +157,7 @@
<number>99999</number> <number>99999</number>
</property> </property>
<property name="hidden"> <property name="hidden">
<string>true</string> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="TQLabel" row="4" column="0"> <widget class="TQLabel" row="4" column="0">
@ -168,7 +168,7 @@
<string>GID offset</string> <string>GID offset</string>
</property> </property>
<property name="hidden"> <property name="hidden">
<string>true</string> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="KIntNumInput" row="4" column="1" colspan="3"> <widget class="KIntNumInput" row="4" column="1" colspan="3">
@ -182,7 +182,7 @@
<number>99999</number> <number>99999</number>
</property> </property>
<property name="hidden"> <property name="hidden">
<string>true</string> <bool>true</bool>
</property> </property>
</widget> </widget>
</grid> </grid>

Write Preview
Loading…
Cancel
Save