320 lines
10 KiB
Plaintext
320 lines
10 KiB
Plaintext
|
Index: build/top.mk
|
||
|
|
===================================================================
|
||
|
|
--- build/top.mk.orig
|
||
|
|
+++ build/top.mk
|
||
|
|
@@ -39,7 +39,7 @@ libdir = @libdir@
|
||
|
|
libexecdir = @libexecdir@
|
||
|
|
localstatedir = @localstatedir@
|
||
|
|
mandir = @mandir@
|
||
|
|
-moduledir = @libexecdir@$(ldap_subdir)
|
||
|
|
+moduledir = @libexecdir@/modules
|
||
|
|
sbindir = @sbindir@
|
||
|
|
sharedstatedir = @sharedstatedir@
|
||
|
|
sysconfdir = @sysconfdir@$(ldap_subdir)
|
||
|
|
@@ -58,7 +58,7 @@ INSTALL_PROGRAM = $(INSTALL)
|
||
|
|
INSTALL_DATA = $(INSTALL) -m 644
|
||
|
|
INSTALL_SCRIPT = $(INSTALL)
|
||
|
|
|
||
|
|
-STRIP = -s
|
||
|
|
+#STRIP = -s
|
||
|
|
|
||
|
|
LINT = lint
|
||
|
|
5LINT = 5lint
|
||
|
|
Index: configure.in
|
||
|
|
===================================================================
|
||
|
|
--- configure.in.orig
|
||
|
|
+++ configure.in
|
||
|
|
@@ -64,7 +64,9 @@ dnl Determine host platform
|
||
|
|
dnl we try not to use this for much
|
||
|
|
AC_CANONICAL_TARGET([])
|
||
|
|
|
||
|
|
-AM_INIT_AUTOMAKE([$OL_PACKAGE],[$OL_VERSION], [no defines])dnl
|
||
|
|
+AC_PROG_MAKE_SET
|
||
|
|
+PACKAGE=$OL_PACKAGE
|
||
|
|
+VERSION=$OL_VERSION
|
||
|
|
AC_SUBST(PACKAGE)dnl
|
||
|
|
AC_SUBST(VERSION)dnl
|
||
|
|
AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
|
||
|
|
Index: servers/slapd/aclparse.c
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/aclparse.c.orig
|
||
|
|
+++ servers/slapd/aclparse.c
|
||
|
|
@@ -662,7 +662,7 @@ parse_acl(
|
||
|
|
if ( rc != LDAP_SUCCESS ) {
|
||
|
|
char buf[ SLAP_TEXT_BUFLEN ];
|
||
|
|
|
||
|
|
- snprintf( buf, sizeof( buf ), "%s: line %d: "
|
||
|
|
+ snprintf( buf, sizeof( buf ),
|
||
|
|
" attr \"%s\" normalization failed (%d: %s)",
|
||
|
|
fname, lineno,
|
||
|
|
a->acl_attrs[ 0 ].an_name.bv_val, rc, text );
|
||
|
|
Index: libraries/liblunicode/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- libraries/liblunicode/Makefile.in.orig
|
||
|
|
+++ libraries/liblunicode/Makefile.in
|
||
|
|
@@ -35,6 +35,9 @@ $(XXDIR)/uctable.h: $(XXDIR)/ucgendat.c
|
||
|
|
$(MAKE) ucgendat
|
||
|
|
./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
ucgendat: $(XLIBS) ucgendat.o
|
||
|
|
$(LTLINK) -o $@ ucgendat.o $(LIBS)
|
||
|
|
|
||
|
|
Index: libraries/liblutil/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- libraries/liblutil/Makefile.in.orig
|
||
|
|
+++ libraries/liblutil/Makefile.in
|
||
|
|
@@ -19,6 +19,9 @@ PROGRAM = testavl
|
||
|
|
LDAP_INCDIR= ../../include
|
||
|
|
LDAP_LIBDIR= ../../libraries
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
NT_SRCS = ntservice.c
|
||
|
|
NT_OBJS = ntservice.o slapdmsg.res
|
||
|
|
|
||
|
|
Index: servers/slapd/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/Makefile.in.orig
|
||
|
|
+++ servers/slapd/Makefile.in
|
||
|
|
@@ -69,6 +69,9 @@ SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BA
|
||
|
|
|
||
|
|
SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
XDEFS = $(MODULES_CPPFLAGS)
|
||
|
|
XLDFLAGS = $(MODULES_LDFLAGS)
|
||
|
|
|
||
|
|
Index: servers/slurpd/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- servers/slurpd/Makefile.in.orig
|
||
|
|
+++ servers/slurpd/Makefile.in
|
||
|
|
@@ -38,6 +38,9 @@ BUILD_SRV = @BUILD_SLURPD@
|
||
|
|
|
||
|
|
all-local-srv: $(PROGRAMS)
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
# $(LTHREAD_LIBS) must be last!
|
||
|
|
XLIBS = $(SLURPD_L)
|
||
|
|
XXLIBS = $(SLURPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
|
||
|
|
Index: servers/slapd/back-bdb/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/back-bdb/Makefile.in.orig
|
||
|
|
+++ servers/slapd/back-bdb/Makefile.in
|
||
|
|
@@ -37,6 +37,9 @@ mod_DEFS = -DSLAPD_IMPORT
|
||
|
|
MOD_DEFS = $(@BUILD_BDB@_DEFS)
|
||
|
|
MOD_LIBS = $(LDBM_LIBS)
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
||
|
|
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||
|
|
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||
|
|
Index: servers/slapd/back-hdb/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/back-hdb/Makefile.in.orig
|
||
|
|
+++ servers/slapd/back-hdb/Makefile.in
|
||
|
|
@@ -39,6 +39,9 @@ mod_DEFS = -DSLAPD_IMPORT
|
||
|
|
MOD_DEFS = $(@BUILD_HDB@_DEFS)
|
||
|
|
MOD_LIBS = $(LDBM_LIBS)
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
||
|
|
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||
|
|
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||
|
|
Index: servers/slapd/back-ldbm/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/back-ldbm/Makefile.in.orig
|
||
|
|
+++ servers/slapd/back-ldbm/Makefile.in
|
||
|
|
@@ -36,6 +36,9 @@ mod_DEFS = -DSLAPD_IMPORT
|
||
|
|
MOD_DEFS = $(@BUILD_LDBM@_DEFS)
|
||
|
|
MOD_LIBS = $(LDBM_LIBS)
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
||
|
|
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||
|
|
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||
|
|
Index: servers/slapd/overlays/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/overlays/Makefile.in.orig
|
||
|
|
+++ servers/slapd/overlays/Makefile.in
|
||
|
|
@@ -41,6 +41,9 @@ LTONLY_MOD = $(LTONLY_mod)
|
||
|
|
LDAP_INCDIR= ../../../include
|
||
|
|
LDAP_LIBDIR= ../../../libraries
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
MOD_DEFS = -DSLAPD_IMPORT
|
||
|
|
|
||
|
|
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
||
|
|
Index: servers/slapd/back-relay/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/back-relay/Makefile.in.orig
|
||
|
|
+++ servers/slapd/back-relay/Makefile.in
|
||
|
|
@@ -24,6 +24,9 @@ BUILD_MOD = @BUILD_RELAY@
|
||
|
|
mod_DEFS = -DSLAPD_IMPORT
|
||
|
|
MOD_DEFS = $(@BUILD_RELAY@_DEFS)
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
||
|
|
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE)
|
||
|
|
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE)
|
||
|
|
Index: servers/slapd/back-ldif/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/back-ldif/Makefile.in.orig
|
||
|
|
+++ servers/slapd/back-ldif/Makefile.in
|
||
|
|
@@ -25,6 +25,9 @@ BUILD_MOD = yes
|
||
|
|
mod_DEFS = -DSLAPD_IMPORT
|
||
|
|
MOD_DEFS = $(yes_DEFS)
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
||
|
|
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||
|
|
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||
|
|
Index: libraries/librewrite/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- libraries/librewrite/Makefile.in.orig
|
||
|
|
+++ libraries/librewrite/Makefile.in
|
||
|
|
@@ -26,6 +26,9 @@ OBJS = config.o context.o info.o ldapmap
|
||
|
|
LDAP_INCDIR= ../../include
|
||
|
|
LDAP_LIBDIR= ../../libraries
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
LIBRARY = librewrite.a
|
||
|
|
PROGRAMS = rewrite
|
||
|
|
XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) \
|
||
|
|
Index: servers/slapd/back-ldap/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/back-ldap/Makefile.in.orig
|
||
|
|
+++ servers/slapd/back-ldap/Makefile.in
|
||
|
|
@@ -27,6 +27,9 @@ BUILD_MOD = @BUILD_LDAP@
|
||
|
|
mod_DEFS = -DSLAPD_IMPORT
|
||
|
|
MOD_DEFS = $(@BUILD_LDAP@_DEFS)
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
||
|
|
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||
|
|
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||
|
|
Index: servers/slapd/back-monitor/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/back-monitor/Makefile.in.orig
|
||
|
|
+++ servers/slapd/back-monitor/Makefile.in
|
||
|
|
@@ -33,6 +33,9 @@ BUILD_MOD = @BUILD_MONITOR@
|
||
|
|
mod_DEFS = -DSLAPD_IMPORT
|
||
|
|
MOD_DEFS = $(@BUILD_MONITOR@_DEFS)
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
||
|
|
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||
|
|
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
|
||
|
|
Index: servers/slapd/modify.c
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/modify.c.orig
|
||
|
|
+++ servers/slapd/modify.c
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-/* $OpenLDAP: pkg/ldap/servers/slapd/modify.c,v 1.227.2.25 2007/01/02 21:43:56 kurt Exp $ */
|
||
|
|
+/* $OpenLDAP: pkg/ldap/servers/slapd/modify.c,v 1.227.2.26 2007/09/04 03:42:37 hyc Exp $ */
|
||
|
|
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||
|
|
*
|
||
|
|
* Copyright 1998-2007 The OpenLDAP Foundation.
|
||
|
|
@@ -734,6 +734,7 @@ int slap_mods_check(
|
||
|
|
"%s: value #%ld normalization failed",
|
||
|
|
ml->sml_type.bv_val, (long) nvals );
|
||
|
|
*text = textbuf;
|
||
|
|
+ BER_BVZERO( &ml->sml_nvalues[nvals] );
|
||
|
|
return rc;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
Index: servers/slapd/back-bdb/modrdn.c
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/back-bdb/modrdn.c.orig
|
||
|
|
+++ servers/slapd/back-bdb/modrdn.c
|
||
|
|
@@ -729,6 +729,8 @@ retry: /* transaction retry */
|
||
|
|
} else {
|
||
|
|
rs->sr_err = LDAP_X_NO_OPERATION;
|
||
|
|
ltid = NULL;
|
||
|
|
+ /* Only free attrs if they were dup'd. */
|
||
|
|
+ if ( dummy.e_attrs == e->e_attrs ) dummy.e_attrs = NULL;
|
||
|
|
goto return_results;
|
||
|
|
}
|
||
|
|
|
||
|
|
Index: libraries/liblber/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- libraries/liblber/Makefile.in.orig
|
||
|
|
+++ libraries/liblber/Makefile.in
|
||
|
|
@@ -34,6 +34,9 @@ PROGRAMS= dtest etest idtest
|
||
|
|
LDAP_INCDIR= ../../include
|
||
|
|
LDAP_LIBDIR= ../../libraries
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A)
|
||
|
|
XXLIBS =
|
||
|
|
NT_LINK_LIBS = $(AC_LIBS)
|
||
|
|
Index: libraries/libldap/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- libraries/libldap/Makefile.in.orig
|
||
|
|
+++ libraries/libldap/Makefile.in
|
||
|
|
@@ -42,6 +42,9 @@ OBJS = bind.lo open.lo result.lo error.l
|
||
|
|
LDAP_INCDIR= ../../include
|
||
|
|
LDAP_LIBDIR= ../../libraries
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
LIB_DEFS = -DLDAP_LIBRARY
|
||
|
|
|
||
|
|
XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
|
||
|
|
Index: libraries/libldap_r/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- libraries/libldap_r/Makefile.in.orig
|
||
|
|
+++ libraries/libldap_r/Makefile.in
|
||
|
|
@@ -49,6 +49,9 @@ OBJS = threads.lo rdwr.lo tpool.lo rq.l
|
||
|
|
LDAP_INCDIR= ../../include
|
||
|
|
LDAP_LIBDIR= ../../libraries
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
LIB_DEFS = -DLDAP_LIBRARY
|
||
|
|
|
||
|
|
XDEFS = -DLDAP_R_COMPILE -I$(XXDIR)
|
||
|
|
Index: servers/slapd/back-meta/Makefile.in
|
||
|
|
===================================================================
|
||
|
|
--- servers/slapd/back-meta/Makefile.in.orig
|
||
|
|
+++ servers/slapd/back-meta/Makefile.in
|
||
|
|
@@ -23,6 +23,9 @@ OBJS = init.lo config.lo search.lo bind.
|
||
|
|
LDAP_INCDIR= ../../../include
|
||
|
|
LDAP_LIBDIR= ../../../libraries
|
||
|
|
|
||
|
|
+PIE_CFLAGS="-fPIE"
|
||
|
|
+PIE_LDFLAGS="-pie"
|
||
|
|
+
|
||
|
|
BUILD_OPT = "--enable-meta"
|
||
|
|
BUILD_MOD = @BUILD_META@
|
||
|
|
|