summaryrefslogtreecommitdiffstats
path: root/tdmlib
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-27 13:26:04 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-27 13:26:04 -0500
commit22d0a673d7d6049d388847b476df1e5b6f3d6b70 (patch)
treeb6fc0fe18603cf23bfbcf480a169081b11a99beb /tdmlib
parente899b7beb6b0f2db8c08dfdc14c29efb99046086 (diff)
downloadtdebase-22d0a673d7d6049d388847b476df1e5b6f3d6b70.tar.gz
tdebase-22d0a673d7d6049d388847b476df1e5b6f3d6b70.zip
Check for tsak presence on lock engage
Fix tsak not exiting on request Clean up build warnings
Diffstat (limited to 'tdmlib')
-rw-r--r--tdmlib/kgreet_pam.cpp1
-rw-r--r--tdmlib/kgreet_winbind.cpp6
-rw-r--r--tdmlib/tdmtsak.cpp14
3 files changed, 16 insertions, 5 deletions
diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp
index 82506fb4..8e294618 100644
--- a/tdmlib/kgreet_pam.cpp
+++ b/tdmlib/kgreet_pam.cpp
@@ -354,7 +354,6 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
}
else if (m_themer) {
kg_debug("themer found!");
- KdmItem *pw_label = 0;
KdmLabel *tdmlabel = static_cast<KdmLabel*>(m_themer->findNode("pw-label"));
if (tdmlabel) {
diff --git a/tdmlib/kgreet_winbind.cpp b/tdmlib/kgreet_winbind.cpp
index d5626a3f..85721dd4 100644
--- a/tdmlib/kgreet_winbind.cpp
+++ b/tdmlib/kgreet_winbind.cpp
@@ -607,14 +607,14 @@ KWinbindGreeter::slotEndDomainList()
TQString current = domainCombo->currentText();
- for (int i = 0; i < domainList.count(); ++i) {
- if (i < domainCombo->count())
+ for (unsigned int i = 0; i < domainList.count(); ++i) {
+ if (i < (uint)domainCombo->count())
domainCombo->changeItem(domainList[i], i);
else
domainCombo->insertItem(domainList[i], i);
}
- while (domainCombo->count() > domainList.count())
+ while ((uint)domainCombo->count() > domainList.count())
domainCombo->removeItem(domainCombo->count()-1);
domainCombo->setCurrentItem( current );
diff --git a/tdmlib/tdmtsak.cpp b/tdmlib/tdmtsak.cpp
index a7cc802f..b3ff08cc 100644
--- a/tdmlib/tdmtsak.cpp
+++ b/tdmlib/tdmtsak.cpp
@@ -121,10 +121,14 @@ int main (int argc, char *argv[])
int verifier_result = tde_sak_verify_calling_process();
bool isdm = false;
+ bool checkonly = false;
if (argc == 2) {
if (strcmp(argv[1], "dm") == 0) {
isdm = true;
}
+ if (strcmp(argv[1], "check") == 0) {
+ checkonly = true;
+ }
}
if (!isdm) {
@@ -139,6 +143,14 @@ int main (int argc, char *argv[])
// OK, the calling process is authorized to retrieve SAK data
// First, flush the buffer
mPipe_fd = open(FIFO_FILE, O_RDONLY | O_NONBLOCK);
+ if (checkonly) {
+ if (mPipe_fd < 0) {
+ return 6; // SAK not available
+ }
+ else {
+ return 0;
+ }
+ }
numread = 1;
while (numread > 0) {
numread = read(mPipe_fd, readbuf, 6);
@@ -177,4 +189,4 @@ int main (int argc, char *argv[])
else {
return verifier_result;
}
-} \ No newline at end of file
+}