]>
Commit | Line | Data |
---|---|---|
0b589327 JR |
1 | diff -urNp -x '*.orig' openldap-2.4.49.org/contrib/ldapc++/examples/startTls.cpp openldap-2.4.49/contrib/ldapc++/examples/startTls.cpp |
2 | --- openldap-2.4.49.org/contrib/ldapc++/examples/startTls.cpp 2020-01-30 18:58:35.000000000 +0100 | |
3 | +++ openldap-2.4.49/contrib/ldapc++/examples/startTls.cpp 2021-05-07 23:04:51.668862326 +0200 | |
4 | @@ -30,6 +30,7 @@ int main( int argc, char* argv[]){ | |
04a5781a | 5 | |
075c07e5 JB |
6 | try { |
7 | // 1. connect using global options | |
8 | + { | |
9 | LDAPAsynConnection l(uri); | |
10 | try { | |
11 | l.start_tls(); | |
0b589327 | 12 | @@ -38,8 +39,10 @@ int main( int argc, char* argv[]){ |
075c07e5 JB |
13 | } catch ( LDAPException e ) { |
14 | std::cerr << e << std::endl; | |
15 | } | |
16 | + } | |
17 | ||
18 | // 2. connect using connection specific option | |
075c07e5 | 19 | + { |
04a5781a JB |
20 | LDAPAsynConnection l1(uri); |
21 | tls=l1.getTlsOptions(); | |
075c07e5 | 22 | std::cout << "Current connection specific settings:" << std::endl; |
0b589327 | 23 | @@ -58,6 +61,7 @@ int main( int argc, char* argv[]){ |
075c07e5 JB |
24 | } catch ( LDAPException e ) { |
25 | std::cerr << e << std::endl; | |
26 | } | |
27 | + } | |
04a5781a | 28 | |
075c07e5 JB |
29 | // 3. and once again using the globals |
30 | try { | |
0b589327 JR |
31 | diff -urNp -x '*.orig' openldap-2.4.49.org/contrib/ldapc++/src/Makefile.am openldap-2.4.49/contrib/ldapc++/src/Makefile.am |
32 | --- openldap-2.4.49.org/contrib/ldapc++/src/Makefile.am 2020-01-30 18:58:35.000000000 +0100 | |
33 | +++ openldap-2.4.49/contrib/ldapc++/src/Makefile.am 2021-05-07 23:04:51.668862326 +0200 | |
34 | @@ -51,7 +51,9 @@ libldapcpp_la_SOURCES = LDAPAddRequest.c | |
35 | StringList.cpp \ | |
36 | TlsOptions.cpp | |
37 | ||
38 | -include_HEADERS = LDAPAsynConnection.h \ | |
39 | +ldapcppincludedir = $(includedir)/ldapc++ | |
40 | + | |
41 | +ldapcppinclude_HEADERS = LDAPAsynConnection.h \ | |
42 | LDAPAttribute.h \ | |
43 | LDAPAttributeList.h \ | |
44 | LDAPAttrType.h \ | |
45 | diff -urNp -x '*.orig' openldap-2.4.49.org/contrib/ldapc++/src/SaslInteractionHandler.cpp openldap-2.4.49/contrib/ldapc++/src/SaslInteractionHandler.cpp | |
46 | --- openldap-2.4.49.org/contrib/ldapc++/src/SaslInteractionHandler.cpp 2020-01-30 18:58:35.000000000 +0100 | |
47 | +++ openldap-2.4.49/contrib/ldapc++/src/SaslInteractionHandler.cpp 2021-05-07 23:04:51.668862326 +0200 | |
48 | @@ -7,6 +7,7 @@ | |
49 | #include <iostream> | |
50 | #include <iomanip> | |
51 | #include <limits> | |
52 | +#include <cstdio> | |
53 | #include "config.h" | |
54 | ||
55 | #ifdef HAVE_TERMIOS_H |