diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-13 22:30:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-13 22:30:16 -0600 |
| commit | bdb1c6b002c350e1354e9d34fa304fd83152502a (patch) | |
| tree | 982bce0ec31b194b8bf8fbdbc36450939a3b5d71 | |
| parent | 9e61d1e26baaa84061d49d88dcf207063106cd67 (diff) | |
| parent | 20c48849ea570d4d264e83bf8a9fb52e7fcbde2e (diff) | |
| download | libtdeldap-bdb1c6b002c350e1354e9d34fa304fd83152502a.tar.gz libtdeldap-bdb1c6b002c350e1354e9d34fa304fd83152502a.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/libtdeldap
| -rw-r--r-- | src/libtdeldap.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libtdeldap.cpp b/src/libtdeldap.cpp index 4c19b56..1f35469 100644 --- a/src/libtdeldap.cpp +++ b/src/libtdeldap.cpp @@ -1024,7 +1024,7 @@ int LDAPManager::setPasswordForUser(LDAPUserInfo user, TQString *errstr) { return 1; // Failure } -TQString tdelistDateTimeToRFCDateTime(TQString datetime) { +TQString klistDateTimeToRFCDateTime(TQString datetime) { // HACK HACK HACK // FIXME TQString ret; @@ -1052,7 +1052,7 @@ TQString tdelistDateTimeToRFCDateTime(TQString datetime) { #define KLIST_STOPTIME_STRING "End time: " #define KLIST_FLAGS_STRING "Ticket flags: " #define KLIST_ADDRESSES_STRING "Ticket flags: " -#define KLIST_NO_TICKET_FILE "tdelist: No ticket file: " +#define KLIST_NO_TICKET_FILE "klist: No ticket file: " #define KLIST_KVNO_STRING "kvno" #define KLIST_ADDRESSLESS_STRING "addressless" @@ -1085,10 +1085,10 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri TQString line; FILE *output; if (cache != "") { - output = popen((TQString("tdelist --cache=%1 -v 2>&1").arg(cache)).ascii(), "r"); + output = popen((TQString("klist --cache=%1 -v 2>&1").arg(cache)).ascii(), "r"); } else { - output = popen("tdelist -v 2>&1", "r"); + output = popen("klist -v 2>&1", "r"); } TQFile f; f.open(IO_ReadOnly, output); @@ -1154,7 +1154,7 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri line.remove(0, strlen(KLIST_AUTHTIME_STRING)); line.replace("(expired)", ""); line = line.simplifyWhiteSpace(); - line = tdelistDateTimeToRFCDateTime(line); + line = klistDateTimeToRFCDateTime(line); ticket.authenticationTime.setTime_t(KRFCDate::parseDate(line)); ticket.informationValid = true; } @@ -1162,7 +1162,7 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri line.remove(0, strlen(KLIST_STARTTIME_STRING)); line.replace("(expired)", ""); line = line.simplifyWhiteSpace(); - line = tdelistDateTimeToRFCDateTime(line); + line = klistDateTimeToRFCDateTime(line); ticket.validStartTime.setTime_t(KRFCDate::parseDate(line)); ticket.informationValid = true; } @@ -1170,7 +1170,7 @@ KerberosTicketInfoList LDAPManager::getKerberosTicketList(TQString cache, TQStri line.remove(0, strlen(KLIST_STOPTIME_STRING)); line.replace("(expired)", ""); line = line.simplifyWhiteSpace(); - line = tdelistDateTimeToRFCDateTime(line); + line = klistDateTimeToRFCDateTime(line); ticket.validEndTime.setTime_t(KRFCDate::parseDate(line)); ticket.informationValid = true; } |