11
11
Bug#457374 filed against evolution-data-server asking if this support is
12
12
still required on 2007-12-21.
14
Index: ubuntu-i/include/ldap.h
14
Index: trunk/include/ldap.h
15
15
===================================================================
16
--- ubuntu-i.orig/include/ldap.h 2008-08-11 14:03:23.000000000 -0400
17
+++ ubuntu-i/include/ldap.h 2008-08-11 15:14:16.000000000 -0400
18
@@ -2359,5 +2359,25 @@
20
LDAPControl **ctrlp ));
16
--- trunk.orig/include/ldap.h
17
+++ trunk/include/ldap.h
18
@@ -2461,5 +2461,25 @@
20
LDAPDerefRes **drp ));
43
43
#endif /* _LDAP_H */
44
Index: ubuntu-i/libraries/libldap/ntlm.c
44
Index: trunk/libraries/libldap/ntlm.c
45
45
===================================================================
46
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
47
+++ ubuntu-i/libraries/libldap/ntlm.c 2008-08-11 15:14:16.000000000 -0400
47
+++ trunk/libraries/libldap/ntlm.c
49
49
+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
184
184
+ return( ld->ld_errno );
187
Index: ubuntu-i/libraries/libldap/Makefile.in
187
Index: trunk/libraries/libldap/Makefile.in
188
188
===================================================================
189
--- ubuntu-i.orig/libraries/libldap/Makefile.in 2008-08-11 14:03:23.000000000 -0400
190
+++ ubuntu-i/libraries/libldap/Makefile.in 2008-08-11 19:07:30.000000000 -0400
189
--- trunk.orig/libraries/libldap/Makefile.in
190
+++ trunk/libraries/libldap/Makefile.in
191
191
@@ -27,7 +27,7 @@
192
192
init.c options.c print.c string.c util-int.c schema.c \
193
charray.c tls.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
194
turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
193
charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
194
tls2.c tls_o.c tls_g.c tls_m.c \
195
- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
196
+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
198
199
OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
199
controls.lo messages.lo references.lo extended.lo cyrus.lo \
201
201
init.lo options.lo print.lo string.lo util-int.lo schema.lo \
202
charray.lo tls.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
203
turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
205
+ assertion.lo ntlm.lo
202
charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
203
tls2.lo tls_o.lo tls_g.lo tls_m.lo \
204
- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
205
+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
206
assertion.lo deref.lo
207
208
LDAP_INCDIR= ../../include
208
LDAP_LIBDIR= ../../libraries
209
Index: ubuntu-i/libraries/libldap_r/Makefile.in
209
Index: trunk/libraries/libldap_r/Makefile.in
210
210
===================================================================
211
--- ubuntu-i.orig/libraries/libldap_r/Makefile.in 2008-08-11 14:03:23.000000000 -0400
212
+++ ubuntu-i/libraries/libldap_r/Makefile.in 2008-08-11 19:08:52.000000000 -0400
211
--- trunk.orig/libraries/libldap_r/Makefile.in
212
+++ trunk/libraries/libldap_r/Makefile.in
213
213
@@ -29,7 +29,7 @@
214
214
init.c options.c print.c string.c util-int.c schema.c \
215
charray.c tls.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
216
turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
215
charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
216
tls2.c tls_o.c tls_g.c tls_m.c \
217
- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
218
+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
219
220
SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \
220
221
thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
221
thr_pth.c thr_stub.c thr_debug.c
223
223
init.lo options.lo print.lo string.lo util-int.lo schema.lo \
224
charray.lo tls.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
225
turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
227
+ assertion.lo ntlm.lo
224
charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
225
tls2.lo tls_o.lo tls_g.lo tls_m.lo \
226
- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
227
+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
228
assertion.lo deref.lo
229
230
LDAP_INCDIR= ../../include
230
LDAP_LIBDIR= ../../libraries