-rw-r--r-- | kabc/plugins/ldap/resourceldap.cpp | 6 |
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 | |||
@@ -12,68 +12,68 @@ | |||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | Enhanced Version of the file for platform independent KDE tools. | 22 | Enhanced Version of the file for platform independent KDE tools. |
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <kdebug.h> | 28 | #include <kdebug.h> |
29 | #include <kglobal.h> | 29 | #include <kglobal.h> |
30 | #include <klineedit.h> | 30 | #include <klineedit.h> |
31 | #include <klocale.h> | 31 | #include <klocale.h> |
32 | #include <kconfig.h> | 32 | #include <kconfig.h> |
33 | #include <kstringhandler.h> | 33 | #include <kstringhandler.h> |
34 | 34 | ||
35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
36 | 36 | ||
37 | #include "resourceldap.h" | 37 | #include "resourceldap.h" |
38 | #include "resourceldapconfig.h" | 38 | #include "resourceldapconfig.h" |
39 | 39 | ||
40 | using namespace KABC; | 40 | using namespace KABC; |
41 | 41 | ||
42 | extern "C" | 42 | extern "C" |
43 | { | 43 | { |
44 | void *init_kabc_ldap() | 44 | //US void *init_kabc_ldap() |
45 | void *init_microkabc_ldap() | ||
45 | { | 46 | { |
46 | qDebug("resourceldap.cpp : init_kabc_ldap has to be changed"); | 47 | return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig>(); |
47 | //US return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig>(); | ||
48 | } | 48 | } |
49 | } | 49 | } |
50 | 50 | ||
51 | void addModOp( LDAPMod ***pmods, const QString &attr, const QString &value ); | 51 | void addModOp( LDAPMod ***pmods, const QString &attr, const QString &value ); |
52 | 52 | ||
53 | 53 | ||
54 | ResourceLDAP::ResourceLDAP( const KConfig *config ) | 54 | ResourceLDAP::ResourceLDAP( const KConfig *config ) |
55 | : Resource( config ), mPort( 389 ), mLdap( 0 ) | 55 | : Resource( config ), mPort( 389 ), mLdap( 0 ) |
56 | { | 56 | { |
57 | KConfig *cfg = (KConfig *)config; | 57 | KConfig *cfg = (KConfig *)config; |
58 | if ( cfg ) { | 58 | if ( cfg ) { |
59 | mUser = cfg->readEntry( "LdapUser" ); | 59 | mUser = cfg->readEntry( "LdapUser" ); |
60 | mPassword = KStringHandler::obscure( cfg->readEntry( "LdapPassword" ) ); | 60 | mPassword = KStringHandler::obscure( cfg->readEntry( "LdapPassword" ) ); |
61 | mDn = cfg->readEntry( "LdapDn" ); | 61 | mDn = cfg->readEntry( "LdapDn" ); |
62 | mHost = cfg->readEntry( "LdapHost" ); | 62 | mHost = cfg->readEntry( "LdapHost" ); |
63 | mPort = cfg->readNumEntry( "LdapPort", 389 ); | 63 | mPort = cfg->readNumEntry( "LdapPort", 389 ); |
64 | mFilter = cfg->readEntry( "LdapFilter" ); | 64 | mFilter = cfg->readEntry( "LdapFilter" ); |
65 | mAnonymous = cfg->readBoolEntry( "LdapAnonymous" ); | 65 | mAnonymous = cfg->readBoolEntry( "LdapAnonymous" ); |
66 | 66 | ||
67 | QStringList attributes = cfg->readListEntry( "LdapAttributes" ); | 67 | QStringList attributes = cfg->readListEntry( "LdapAttributes" ); |
68 | for ( uint pos = 0; pos < attributes.count(); pos += 2 ) | 68 | for ( uint pos = 0; pos < attributes.count(); pos += 2 ) |
69 | mAttributes.insert( attributes[ pos ], attributes[ pos + 1 ] ); | 69 | mAttributes.insert( attributes[ pos ], attributes[ pos + 1 ] ); |
70 | } | 70 | } |
71 | 71 | ||
72 | /** | 72 | /** |
73 | If you want to add new attributes, append them here, add a | 73 | If you want to add new attributes, append them here, add a |
74 | translation string in the ctor of AttributesDialog and | 74 | translation string in the ctor of AttributesDialog and |
75 | handle them in the load() method below. | 75 | handle them in the load() method below. |
76 | These are the default values from | 76 | These are the default values from |
77 | */ | 77 | */ |
78 | if ( mAttributes.count() == 0 ) { | 78 | if ( mAttributes.count() == 0 ) { |
79 | mAttributes.insert( "commonName", "cn" ); | 79 | mAttributes.insert( "commonName", "cn" ); |