[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kabc/plugins/ldap
From:       Ian Reinhart Geiser <geiseri () kde ! org>
Date:       2003-01-05 17:15:48
[Download RAW message or body]

CVS commit by geiseri: 

Fixes for solaris, these did not seem to make it into 3.1 but really should have \
been... for that matter i cannot clearly remember if i posted this patch to the list \
so its probibly my fault :P CCMAIL:mueller@kde.org 


  M +1 -1      Makefile.am   1.7
  M +10 -4     resourceldap.cpp   1.17
  M +0 -3      resourceldap.h   1.8


--- kdelibs/kabc/plugins/ldap/Makefile.am  #1.6:1.7
@@ -1,3 +1,3 @@
-INCLUDES = -I$(top_srcdir)/kabc $(all_includes)
+INCLUDES = $(LDAP_INCS) -I$(top_srcdir)/kabc $(all_includes)
 
 # these are the headers for your project

--- kdelibs/kabc/plugins/ldap/resourceldap.cpp  #1.16:1.17
@@ -18,4 +18,6 @@
     Boston, MA 02111-1307, USA.
 */
+#include <lber.h>
+#include <ldap.h>
 
 #include <kdebug.h>
@@ -91,5 +93,9 @@ bool ResourceLDAP::doOpen()
           mPort = 389;
 
+<<<<<<< resourceldap.cpp
+  mLdap = ldap_init( mHost.local8Bit().data(), mPort.toInt() );
+=======
   mLdap = ldap_init( mHost.local8Bit(), mPort );
+>>>>>>> 1.15
   if ( !mLdap ) {
           addressBook()->error( i18n( "Unable to connect to server '%1' on port \
'%2'" ).arg( mHost ).arg( mPort ) ); @@ -98,5 +104,5 @@ bool ResourceLDAP::doOpen()
 
   if ( !mUser.isEmpty() && !mAnonymous ) {
-          if ( ldap_simple_bind_s( mLdap, mUser.local8Bit(), mPassword.local8Bit() ) \
!= LDAP_SUCCESS ) { +          if ( ldap_simple_bind_s( mLdap, \
                mUser.local8Bit().data(), mPassword.local8Bit().data() ) != \
                LDAP_SUCCESS ) {
             addressBook()->error( i18n( "Unable to bind to server '%1'" ).arg( mHost \
) );  return false;
@@ -149,5 +155,5 @@ bool ResourceLDAP::load()
     0 };
 
-  if ( ldap_search_s( mLdap, mDn.local8Bit(), LDAP_SCOPE_SUBTREE, QString( "(%1)" \
).arg( mFilter ).local8Bit(), +  if ( ldap_search_s( mLdap, mDn.local8Bit().data(), \
LDAP_SCOPE_SUBTREE, QString( "(%1)" ).arg( mFilter ).local8Bit().data(),  (char \
                **)LdapSearchAttr, 0, &res ) != LDAP_SUCCESS ) {
     addressBook()->error( i18n( "Unable to search on server '%1'" ).arg( mHost ) );
@@ -249,5 +255,5 @@ bool ResourceLDAP::save( Ticket * )
 
       int retval;
-      if ( (retval = ldap_add_s( mLdap, dn.local8Bit(), mods )) != LDAP_SUCCESS )
+      if ( (retval = ldap_add_s( mLdap, dn.local8Bit().data(), mods )) != \
                LDAP_SUCCESS )
          addressBook()->error( i18n( "Unable to modify '%1' on server '%2'" ).arg( \
(*it).uid() ).arg( mHost ) );  
@@ -271,5 +277,5 @@ void ResourceLDAP::removeAddressee( cons
   kdDebug(5700) << "ldap:removeAddressee" << filter << endl;
 
-  ldap_search_s( mLdap, mDn.local8Bit(), LDAP_SCOPE_SUBTREE, filter.local8Bit(),
+  ldap_search_s( mLdap, mDn.local8Bit().data(), LDAP_SCOPE_SUBTREE, \
filter.local8Bit().data(),  0, 0, &res );
 

--- kdelibs/kabc/plugins/ldap/resourceldap.h  #1.7:1.8
@@ -23,7 +23,4 @@
 
 
-#include <lber.h>
-#include <ldap.h>
-
 #include "addressbook.h"
 #include "resource.h"


[prev in list] [next in list] [prev in thread] [next in thread]