pdns-int16.patch

   1 diff -uNr pdns-3.0/modules/ldapbackend/ldapbackend.cc pdns-3.0.new/modules/ldapbackend/ldapbackend.cc
   2 --- pdns-3.0/modules/ldapbackend/ldapbackend.cc 2011-07-22 13:23:22.000000000 +0200
   3 +++ pdns-3.0.new/modules/ldapbackend/ldapbackend.cc     2011-11-28 11:55:30.704283338 +0100
   4 @@ -434,7 +434,7 @@
   5                                                                 continue;
   6                                                         }
   7
   8 -                                                       rr.priority = (uint16_t) strtoul( (content.substr( 0, first )).c_str(), &endptr, 10 );
   9 +                                                       rr.priority = (u_int16_t) strtoul( (content.substr( 0, first )).c_str(), &endptr, 10 );
  10                                                         if( *endptr != '\0' )
  11                                                         {
  12                                                                 L << Logger::Warning << m_myname << " Invalid " << attrname << " without priority for " << m_qname << ": " << content << endl;
  13 diff -uNr pdns-3.0/modules/ldapbackend/powerldap.cc pdns-3.0.new/modules/ldapbackend/powerldap.cc
  14 --- pdns-3.0/modules/ldapbackend/powerldap.cc   2011-07-22 13:23:22.000000000 +0200
  15 +++ pdns-3.0.new/modules/ldapbackend/powerldap.cc       2011-11-28 11:55:46.355019073 +0100
  16 @@ -4,7 +4,7 @@
  17
  18
  19
  20 -PowerLDAP::PowerLDAP( const string& hosts, uint16_t port, bool tls )
  21 +PowerLDAP::PowerLDAP( const string& hosts, u_int16_t port, bool tls )
  22  {
  23          d_ld = 0;
  24          d_hosts = hosts;
  25 diff -uNr pdns-3.0/modules/ldapbackend/powerldap.hh pdns-3.0.new/modules/ldapbackend/powerldap.hh
  26 --- pdns-3.0/modules/ldapbackend/powerldap.hh   2011-07-22 13:23:22.000000000 +0200
  27 +++ pdns-3.0.new/modules/ldapbackend/powerldap.hh       2011-11-28 11:54:08.347077606 +0100
  28 @@ -18,7 +18,7 @@
  29   */
  30
  31
  32 -
  33 +#include <sys/types.h>
  34  #include <map>
  35  #include <string>
  36  #include <vector>
  37 @@ -69,7 +69,7 @@
  38          typedef map<string, vector<string> > sentry_t;
  39          typedef vector<sentry_t> sresult_t;
  40
  41 -        PowerLDAP( const string& hosts = "ldap://127.0.0.1/", uint16_t port = LDAP_PORT, bool tls = false );
  42 +        PowerLDAP( const string& hosts = "ldap://127.0.0.1/", u_int16_t port = LDAP_PORT, bool tls = false );
  43          ~PowerLDAP();
  44
  45          void getOption( int option, int* value );