ITS#6684 fix ppolicy crash, fix Makefile install target

This commit is contained in:
Howard Chu 2010-12-30 18:40:01 +00:00
parent 46f4813632
commit 41f15a0080
2 changed files with 12 additions and 5 deletions

View file

@ -2,6 +2,13 @@ LIBTOOL=../../../libtool
CPPFLAGS+=-I../../../include -I../../../servers/slapd
ldap_subdir = openldap
prefix=/usr/local
exec_prefix = $(prefix)
libdir = $(exec_prefix)/lib
libexecdir = $(exec_prefix)/libexec
moduledir = $(exec_prefix)/libexec/$(ldap_subdir)
all: autogroup.la
autogroup.lo: autogroup.c
@ -9,12 +16,12 @@ autogroup.lo: autogroup.c
autogroup.la: autogroup.lo
$(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
-rpath $(PREFIX)/lib -module -o $@ $?
-rpath $(libdir) -module -o $@ $?
clean:
rm -f autogroup.lo autogroup.la
install: autogroup.la
mkdir -p $(PREFIX)/lib/openldap
$(LIBTOOL) --mode=install cp autogroup.la $(PREFIX)/lib/openldap
$(LIBTOOL) --finish $(PREFIX)/lib
mkdir -p $(DESTDIR)$(moduledir)
$(LIBTOOL) --mode=install cp autogroup.la $(DESTDIR)$(moduledir)
$(LIBTOOL) --finish $(DESTDIR)$(moduledir)

View file

@ -1712,7 +1712,7 @@ autogroup_db_open(
Debug( LDAP_DEBUG_TRACE, "==> autogroup_db_open\n", 0, 0, 0);
if ( agi == NULL ) {
if ( agi == NULL || !( slapMode & SLAP_SERVER_MODE )) {
return 0;
}