+ $(MKDIR) $(DESTDIR)$(schemadir)
+ echo $(INSTALL) $(INSTALLFLAGS) -m 444 ldapns.schema $(DESTDIR)$(schemadir)
+ $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/ldapns.schema $(DESTDIR)$(schemadir)
-diff -urN openldap-2.4.25/contrib/slapd-modules/passwd/Makefile openldap-2.4.25-contrib/contrib/slapd-modules/passwd/Makefile
---- openldap-2.4.25/contrib/slapd-modules/passwd/Makefile 2009-04-28 03:06:14.000000000 +0200
-+++ openldap-2.4.25-contrib/contrib/slapd-modules/passwd/Makefile 1970-01-01 01:00:00.000000000 +0100
-@@ -1,37 +0,0 @@
+--- openldap-2.4.27/contrib/slapd-modules/passwd/Makefile 2009-04-28 03:06:14.000000000 +0200
++++ openldap-2.4.27-contrib/contrib/slapd-modules/passwd/Makefile 1970-01-01 01:00:00.000000000 +0100
+@@ -1,46 +0,0 @@
-# $OpenLDAP$
-CPPFLAGS+=-I../../../include -I../../../servers/slapd
-
--all: kerberos.la netscape.la radius.la
+-all: kerberos.la netscape.la radius.la apr1.la
-
-kerberos.lo: kerberos.c
- $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -DHAVE_KRB5 -Wall -c $?
- $(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
- -rpath $(PREFIX)/lib -module -o $@ $? -lradius
-
+-apr1.lo: apr1.c
+- $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -Wall -c $?
+-
+-apr1.la: apr1.lo
+- $(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
+- -rpath $(PREFIX)/lib -module -o $@ $?
+-
-clean:
- rm -f kerberos.lo kerberos.la
- rm -f netscape.lo netscape.la
- rm -f radius.lo radius.la
+- rm -f apr1.lo apr1.la
-
--install: kerberos.la netscape.la radius.la
+-install: kerberos.la netscape.la radius.la apr1.la
- mkdir -p $(PREFIX)/lib/openldap
- $(LIBTOOL) --mode=install cp kerberos.la $(PREFIX)/lib/openldap
- $(LIBTOOL) --mode=install cp netscape.la $(PREFIX)/lib/openldap
- $(LIBTOOL) --mode=install cp radius.la $(PREFIX)/lib/openldap
+- $(LIBTOOL) --mode=install cp apr1.la $(PREFIX)/lib/openldap
- $(LIBTOOL) --finish $(PREFIX)/lib
-diff -urN openldap-2.4.25/contrib/slapd-modules/passwd/Makefile.in openldap-2.4.25-contrib/contrib/slapd-modules/passwd/Makefile.in
---- openldap-2.4.25/contrib/slapd-modules/passwd/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ openldap-2.4.25-contrib/contrib/slapd-modules/passwd/Makefile.in 2011-03-28 17:51:20.148152000 +0200
-@@ -0,0 +1,61 @@
-+SRCS = kerberos.c netscape.c radius.c
+--- openldap-2.4.27/contrib/slapd-modules/passwd/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ openldap-2.4.27-contrib/contrib/slapd-modules/passwd/Makefile.in 2011-03-28 17:51:20.148152000 +0200
+@@ -0,0 +1,64 @@
++SRCS = kerberos.c netscape.c radius.c apr1.c
+
-+OBJS = kerberos.lo netscape.lo radius.lo
++OBJS = kerberos.lo netscape.lo radius.lo apr1.lo
+
+LTONLY_MOD = $(LTONLY_mod)
+LDAP_INCDIR= ../../../include
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+
+LIBRARY = libpasswd.a
-+PROGRAMS = kerberos.la netscape.la radius.la
++PROGRAMS = kerberos.la netscape.la radius.la apr1.la
+
+XINCPATH = -I.. -I$(srcdir)/.. -I../../../servers/slapd
+XDEFS = $(MODULES_CPPFLAGS)
+radius.la : radius.lo
+ $(LTLINK_MOD) -module -o $@ radius.lo version.lo $(LINK_LIBS) $(RADIUS_LIBS)
+
++apr1.la : apr1.lo
++ $(LTLINK_MOD) -module -o $@ apr1.lo version.lo $(LINK_LIBS) $(RADIUS_LIBS)
++
+install-local: $(PROGRAMS)
+ @if test -n "$?" ; then \
+ $(MKDIR) $(DESTDIR)$(moduledir); \
#include "config.h"
#ifdef HAVE_TERMIOS_H
---- openldap-2.4.22/contrib/ldapc++/examples/startTls.cpp.orig 2010-04-15 01:50:43.000000000 +0200
-+++ openldap-2.4.22/contrib/ldapc++/examples/startTls.cpp 2010-05-19 07:22:39.855313030 +0200
+--- openldap-2.4.27/contrib/ldapc++/examples/startTls.cpp.orig 2011-11-23 20:58:23.000000000 +0100
++++ openldap-2.4.27/contrib/ldapc++/examples/startTls.cpp 2011-11-27 10:15:54.434540198 +0100
@@ -30,6 +30,7 @@
-
+
try {
// 1. connect using global options
+ {
LDAPAsynConnection l(uri);
try {
l.start_tls();
-@@ -38,9 +39,11 @@
+@@ -38,8 +39,10 @@
} catch ( LDAPException e ) {
std::cerr << e << std::endl;
}
+ }
// 2. connect using connection specific option
-- l = LDAPAsynConnection(uri);
+ {
-+ LDAPAsynConnection l(uri);
- tls=l.getTlsOptions();
+ LDAPAsynConnection l1(uri);
+ tls=l1.getTlsOptions();
std::cout << "Current connection specific settings:" << std::endl;
- std::cout << " CaCertfile: " << tls.getStringOption( TlsOptions::CACERTFILE) << std::endl;
@@ -58,6 +61,7 @@
} catch ( LDAPException e ) {
std::cerr << e << std::endl;
}
+ }
-
+
// 3. and once again using the globals
try {
Summary(ru.UTF-8): Образцы клиентов LDAP
Summary(uk.UTF-8): Зразки клієнтів LDAP
Name: openldap
-Version: 2.4.26
-Release: 2
+Version: 2.4.27
+Release: 1
License: OpenLDAP Public License
Group: Networking/Daemons
Source0: ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
-# Source0-md5: f36f3086031dd56ae94f722ffae8df5e
+# Source0-md5: af754236477fea70bcf6e31824eb60a2
Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
# Source1-md5: 718082e7e35fc48478a2334b0bc4cd11
Source2: ldap.init
%attr(755,root,root) %{_libdir}/libslapd_db-4.6.so
%endif
%dir %{_sysconfdir}/openldap/schema
-%attr(640,root,slapd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/slapd.conf
%attr(640,root,slapd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/slapd.access.conf
+%attr(640,root,slapd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/slapd.conf
+%attr(640,root,slapd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/slapd.ldif
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openldap/schema/*.schema
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ldap
%attr(754,root,root) /etc/rc.d/init.d/ldap
%{schemadir}/*.schema
%exclude %{schemadir}/ldapns.schema
%dir %{_libdir}/openldap
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/slap*
%{_mandir}/man5/slapd.*.5*
%{_mandir}/man5/slapd-config.5*
%{_mandir}/man5/slapd-ldbm.5*
%{_mandir}/man5/slapd-ldif.5*
+%{_mandir}/man5/slapd-mdb.5*
%{_mandir}/man5/slapd-null.5*
-%{_mandir}/man8/slap*
+%{_mandir}/man8/slap*.8*
%files backend-bdb
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/openldap/back_sock*.so*
%{_libdir}/openldap/back_sock.la
%{_mandir}/man5/slapd-sock.5*
+%{_mandir}/man5/slapo-sock.5*
%if %{with odbc}
%files backend-sql