summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/ldap/resourceldap.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kabc/plugins/ldap/resourceldap.cpp b/kabc/plugins/ldap/resourceldap.cpp
index 1c54f63..55c43af 100644
--- a/kabc/plugins/ldap/resourceldap.cpp
+++ b/kabc/plugins/ldap/resourceldap.cpp
@@ -1,239 +1,239 @@
/*
This file is part of libkabc.
Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
/*
Enhanced Version of the file for platform independent KDE tools.
Copyright (c) 2004 Ulf Schenk
$Id$
*/
#include <kdebug.h>
#include <kglobal.h>
#include <klineedit.h>
#include <klocale.h>
#include <kconfig.h>
#include <kstringhandler.h>
#include <stdlib.h>
#include "resourceldap.h"
#include "resourceldapconfig.h"
using namespace KABC;
extern "C"
{
- void *init_kabc_ldap()
+//US void *init_kabc_ldap()
+ void *init_microkabc_ldap()
{
- qDebug("resourceldap.cpp : init_kabc_ldap has to be changed");
-//US return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig>();
+ return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig>();
}
}
void addModOp( LDAPMod ***pmods, const QString &attr, const QString &value );
ResourceLDAP::ResourceLDAP( const KConfig *config )
: Resource( config ), mPort( 389 ), mLdap( 0 )
{
KConfig *cfg = (KConfig *)config;
if ( cfg ) {
mUser = cfg->readEntry( "LdapUser" );
mPassword = KStringHandler::obscure( cfg->readEntry( "LdapPassword" ) );
mDn = cfg->readEntry( "LdapDn" );
mHost = cfg->readEntry( "LdapHost" );
mPort = cfg->readNumEntry( "LdapPort", 389 );
mFilter = cfg->readEntry( "LdapFilter" );
mAnonymous = cfg->readBoolEntry( "LdapAnonymous" );
QStringList attributes = cfg->readListEntry( "LdapAttributes" );
for ( uint pos = 0; pos < attributes.count(); pos += 2 )
mAttributes.insert( attributes[ pos ], attributes[ pos + 1 ] );
}
/**
If you want to add new attributes, append them here, add a
translation string in the ctor of AttributesDialog and
handle them in the load() method below.
These are the default values from
*/
if ( mAttributes.count() == 0 ) {
mAttributes.insert( "commonName", "cn" );
mAttributes.insert( "formattedName", "displayName" );
mAttributes.insert( "familyName", "sn" );
mAttributes.insert( "givenName", "givenName" );
mAttributes.insert( "mail", "mail" );
mAttributes.insert( "mailAlias", "" );
mAttributes.insert( "phoneNumber", "telephoneNumber" );
mAttributes.insert( "uid", "uid" );
}
}
void ResourceLDAP::writeConfig( KConfig *config )
{
Resource::writeConfig( config );
config->writeEntry( "LdapUser", mUser );
config->writeEntry( "LdapPassword", KStringHandler::obscure( mPassword ) );
config->writeEntry( "LdapDn", mDn );
config->writeEntry( "LdapHost", mHost );
config->writeEntry( "LdapPort", mPort );
config->writeEntry( "LdapFilter", mFilter );
config->writeEntry( "LdapAnonymous", mAnonymous );
QStringList attributes;
QMap<QString, QString>::Iterator it;
for ( it = mAttributes.begin(); it != mAttributes.end(); ++it )
attributes << it.key() << it.data();
config->writeEntry( "LdapAttributes", attributes );
}
Ticket *ResourceLDAP::requestSaveTicket()
{
if ( !addressBook() ) {
kdDebug(5700) << "no addressbook" << endl;
return 0;
}
return createTicket( this );
}
bool ResourceLDAP::doOpen()
{
if ( mLdap )
return false;
if ( !mPort )
mPort = 389;
mLdap = ldap_init( mHost.local8Bit(), mPort );
if ( !mLdap ) {
addressBook()->error( i18n( "Unable to connect to server '%1' on port '%2'" ).arg( mHost ).arg( mPort ) );
return false;
}
if ( !mUser.isEmpty() && !mAnonymous ) {
if ( ldap_simple_bind_s( mLdap, mUser.local8Bit(), mPassword.local8Bit() ) != LDAP_SUCCESS ) {
addressBook()->error( i18n( "Unable to bind to server '%1'" ).arg( mHost ) );
return false;
}
kdDebug(5700) << "ResourceLDAP: bind to server successfully" << endl;
} else {
if ( ldap_simple_bind_s( mLdap, NULL, NULL ) != LDAP_SUCCESS ) {
addressBook()->error( i18n( "Unable to bind anonymously to server '%1'" ).arg( mHost ) );
return false;
}
kdDebug( 5700 ) << "ResourceLDAP: bind anonymously to server successfully" << endl;
}
int deref = LDAP_DEREF_ALWAYS;
if ( ldap_set_option( mLdap, LDAP_OPT_DEREF, (void *) &deref ) != LDAP_OPT_SUCCESS ) {
kdDebug(5700) << "ResourceLDAP: can't set 'deref' option" << endl;
return false;
}
if ( ldap_set_option( mLdap, LDAP_OPT_REFERRALS, LDAP_OPT_ON ) != LDAP_OPT_SUCCESS ) {
kdDebug(5700) << "ResourceLDAP: can't set 'referrals' option" << endl;
return false;
}
return true;
}
void ResourceLDAP::doClose()
{
if ( ldap_unbind_s( mLdap ) != LDAP_SUCCESS ) {
kdDebug(5700) << "ResourceLDAP: can't unbind from server" << endl;
return;
}
mLdap = 0;
}
bool ResourceLDAP::load()
{
LDAPMessage *res;
LDAPMessage *msg;
BerElement *track;
char *names;
char **values;
char **LdapSearchAttr = new char*[ mAttributes.count() + 1 ];
QMap<QString, QString>::Iterator it;
int i = 0;
for ( it = mAttributes.begin(); it != mAttributes.end(); ++it ) {
if ( !it.data().isEmpty() ) {
unsigned int len = it.data().utf8().length();
LdapSearchAttr[ i ] = new char[ len+1 ];
memcpy( LdapSearchAttr[ i ], it.data().utf8(), len );
LdapSearchAttr[ i ][ len ] = 0;
++i;
}
}
LdapSearchAttr[ i ] = 0;
QString filter = mFilter;
if ( filter.isEmpty() )
filter = "cn=*";
int result;
if ( ( result = ldap_search_s( mLdap, mDn.local8Bit(), LDAP_SCOPE_SUBTREE, QString( "(%1)" ).arg( filter ).local8Bit(),
LdapSearchAttr, 0, &res ) != LDAP_SUCCESS ) ) {
addressBook()->error( i18n( "Unable to search on server '%1': %2" )
.arg( mHost )
.arg( ldap_err2string( result ) ) );
for ( i = 0; LdapSearchAttr[ i ]; ++i )
delete [] LdapSearchAttr[ i ];
delete [] LdapSearchAttr;
return false;
}
for ( msg = ldap_first_entry( mLdap, res ); msg; msg = ldap_next_entry( mLdap, msg ) ) {
Addressee addr;
addr.setResource( this );
for ( names = ldap_first_attribute( mLdap, msg, &track ); names; names = ldap_next_attribute( mLdap, msg, track ) ) {
values = ldap_get_values( mLdap, msg, names );
for ( int i = 0; i < ldap_count_values( values ); ++i ) {
QString name = QString::fromUtf8( names ).lower();
QString value = QString::fromUtf8( values[ i ] );
if ( name == mAttributes[ "commonName" ].lower() ) {
if ( !addr.formattedName().isEmpty() ) {
QString fn = addr.formattedName();
addr.setNameFromString( value );
addr.setFormattedName( fn );
} else
addr.setNameFromString( value );
} else if ( name == mAttributes[ "formattedName" ].lower() ) {
addr.setFormattedName( value );
} else if ( name == mAttributes[ "givenName" ].lower() ) {
addr.setGivenName( value );
} else if ( name == mAttributes[ "mail" ].lower() ) {
addr.insertEmail( value, true );
} else if ( name == mAttributes[ "mailAlias" ].lower() ) {
addr.insertEmail( value, false );
} else if ( name == mAttributes[ "phoneNumber" ].lower() ) {