author | clem <clem> | 2004-09-17 21:05:46 (UTC) |
---|---|---|
committer | clem <clem> | 2004-09-17 21:05:46 (UTC) |
commit | dcb3342e9f310425ed1abeaa6c00a3132ec609b8 (patch) (side-by-side diff) | |
tree | 383be9477bc59940722094ca6854186afa80e7bd | |
parent | f35f5bef4c8bad180a02b1804fe0ce8fd7c451bd (diff) | |
download | opie-dcb3342e9f310425ed1abeaa6c00a3132ec609b8.zip opie-dcb3342e9f310425ed1abeaa6c00a3132ec609b8.tar.gz opie-dcb3342e9f310425ed1abeaa6c00a3132ec609b8.tar.bz2 |
if there are no configured plugins, we simply return 0 to let the user in
-rw-r--r-- | libopie2/opiesecurity/multiauthcommon.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libopie2/opiesecurity/multiauthcommon.cpp b/libopie2/opiesecurity/multiauthcommon.cpp index d8e26d5..9de62d2 100644 --- a/libopie2/opiesecurity/multiauthcommon.cpp +++ b/libopie2/opiesecurity/multiauthcommon.cpp @@ -44,64 +44,73 @@ void SecOwnerDlg::resizeEvent( QResizeEvent * ) } bool SecOwnerDlg::eventFilter(QObject *o, QEvent *e) { if (e->type() == QEvent::KeyPress || e->type() == QEvent::MouseButtonPress ) { accept(); return TRUE; } return QWidget::eventFilter(o, e); } void SecOwnerDlg::mousePressEvent( QMouseEvent * ) { accept(); } namespace Internal { /// run plugins until we reach nbSuccessMin successes int runPlugins() { SecOwnerDlg *oi = 0; // see if there is contact information. QString vfilename = Global::applicationFileName("addressbook", "businesscard.vcf"); if (QFile::exists(vfilename)) { Contact c; c = Contact::readVCard( vfilename )[0]; oi = new SecOwnerDlg(0, 0, c, TRUE, TRUE); } Config config("Security"); config.setGroup("Plugins"); QStringList plugins = config.readListEntry("IncludePlugins", ','); + /* if there are no configured plugins, we simply return 0 to + * let the user in: + */ + if (plugins.isEmpty() == true) { + owarn << "No authentication plugin has been configured yet!" << oendl; + odebug << "Letting the user in..." << oendl; + if(oi) delete oi; + return 0; + } config.setGroup("Misc"); int nbSuccessMin = config.readNumEntry("nbSuccessMin", 1); int nbSuccess = 0; /* tries to launch successively each plugin in $OPIEDIR/plugins/security * directory which file name is in Security.conf / [Misc] / IncludePlugins */ QString path = QPEApplication::qpeDir() + "/plugins/security"; QStringList::Iterator libIt; for ( libIt = plugins.begin(); libIt != plugins.end(); ++libIt ) { QInterfacePtr<MultiauthPluginInterface> iface; QLibrary *lib = new QLibrary( path + "/" + *libIt ); if ( lib->queryInterface( IID_MultiauthPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) { // the plugin is a true Multiauth plugin odebug << "Accepted plugin: " << QString( path + "/" + *libIt ) << oendl; odebug << "Plugin name: " << iface->plugin()->pluginName() << oendl; int resultCode; int tries = 0; // perform authentication resultCode = iface->plugin()->authenticate(); // display the result in command line QString resultMessage; switch (resultCode) { |