projects / packages / pdns.git / blame
| Commit | Line | Data |
|---|---|---|
| 0b603aab AG |
1 | --- pdns-2.9.22/modules/ldapbackend/powerldap.hh~ 2009-02-07 19:46:56.713653002 +0100 |
| 2 | +++ pdns-2.9.22/modules/ldapbackend/powerldap.hh 2009-02-07 19:47:40.993231763 +0100 | |
| 3 | @@ -18,7 +18,7 @@ | |
| 4 | */ | |
| 5 | ||
| 6 | ||
| 7 | - | |
| 8 | +#include <sys/types.h> | |
| 9 | #include <map> | |
| 10 | #include <string> | |
| 11 | #include <vector> | |
| 3dd1babb | 12 | diff -Nur pdns-2.9.21.1.orig/modules/ldapbackend/ldapbackend.cc pdns-2.9.21.1.int16/modules/ldapbackend/ldapbackend.cc |
| 13 | --- pdns-2.9.21.1.orig/modules/ldapbackend/ldapbackend.cc 2007-04-21 07:56:36.000000000 -0600 | |
| 14 | +++ pdns-2.9.21.1.int16/modules/ldapbackend/ldapbackend.cc 2008-10-06 10:08:55.000000000 -0600 | |
| 15 | @@ -433,7 +433,7 @@ | |
| 313ceca8 MW |
16 | continue; |
| 17 | } | |
| 18 | ||
| 19 | - rr.priority = (uint16_t) strtoul( (content.substr( 0, first )).c_str(), &endptr, 10 ); | |
| 20 | + rr.priority = (u_int16_t) strtoul( (content.substr( 0, first )).c_str(), &endptr, 10 ); | |
| 21 | if( *endptr != '\0' ) | |
| 22 | { | |
| 23 | L << Logger::Warning << m_myname << " Invalid " << attrname << " without priority for " << m_qname << ": " << content << endl; | |
| 3dd1babb | 24 | diff -Nur pdns-2.9.21.1.orig/modules/ldapbackend/powerldap.cc pdns-2.9.21.1.int16/modules/ldapbackend/powerldap.cc |
| 25 | --- pdns-2.9.21.1.orig/modules/ldapbackend/powerldap.cc 2007-04-21 07:56:36.000000000 -0600 | |
| 26 | +++ pdns-2.9.21.1.int16/modules/ldapbackend/powerldap.cc 2008-10-06 10:08:55.000000000 -0600 | |
| 313ceca8 MW |
27 | @@ -2,7 +2,7 @@ |
| 28 | ||
| 29 | ||
| 30 | ||
| 196f0df9 | 31 | -PowerLDAP::PowerLDAP( const string& hosts, uint16_t port, bool tls ) |
| 32 | +PowerLDAP::PowerLDAP( const string& hosts, u_int16_t port, bool tls ) | |
| 313ceca8 MW |
33 | { |
| 34 | int protocol = LDAP_VERSION3; | |
| 35 | ||
| 3dd1babb | 36 | diff -Nur pdns-2.9.21.1.orig/modules/ldapbackend/powerldap.hh pdns-2.9.21.1.int16/modules/ldapbackend/powerldap.hh |
| 37 | --- pdns-2.9.21.1.orig/modules/ldapbackend/powerldap.hh 2007-04-21 07:56:36.000000000 -0600 | |
| 38 | +++ pdns-2.9.21.1.int16/modules/ldapbackend/powerldap.hh 2008-10-06 10:11:53.000000000 -0600 | |
| 3dd1babb | 39 | @@ -78,7 +74,7 @@ |
| 313ceca8 MW |
40 | typedef map<string, vector<string> > sentry_t; |
| 41 | typedef vector<sentry_t> sresult_t; | |
| 42 | ||
| 196f0df9 | 43 | - PowerLDAP( const string& hosts = "ldap://127.0.0.1/", uint16_t port = LDAP_PORT, bool tls = false ); |
| 44 | + PowerLDAP( const string& hosts = "ldap://127.0.0.1/", u_int16_t port = LDAP_PORT, bool tls = false ); | |
| 313ceca8 MW |
45 | ~PowerLDAP(); |
| 46 | ||
| 47 | void getOption( int option, int* value ); |