ITS#6684

diff --git a/CHANGES b/CHANGES
index fa823a0df5bf4bd8773ffb19e07afe649e1e2644..7af8347b7c662ff9c8e40ddce1671115203b914e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -83,6 +83,8 @@ OpenLDAP 2.4.24 Engineering
        Fixed slapo-syncprov sessionlog ordering (ITS#6716)
        Fixed slapo-translucent entry leak (ITS#6746)
        Fixed contrib/autogroup LDAP URI with attribute filter (ITS#6536)
+       Fixed contrib/autogroup install location (ITS#6684)
+       Fixed contrib/autogroup crash with ppolicy (ITS#6684)
        Fixed contrib/nssov to only close socket on shutdown (ITS#6676)
        Fixed contrib/nssov multi platform support (ITS#6604)
        Build Environment

diff --git a/contrib/slapd-modules/autogroup/Makefile b/contrib/slapd-modules/autogroup/Makefile
index 3c1f1d2151a32d5f840c2f581803c30ee414eec0..70146ac648476fcb5d845da3ed55232147c2626e 100644 (file)
--- a/contrib/slapd-modules/autogroup/Makefile
+++ b/contrib/slapd-modules/autogroup/Makefile
@@ -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)

diff --git a/contrib/slapd-modules/autogroup/autogroup.c b/contrib/slapd-modules/autogroup/autogroup.c
index 05f5f3a02e0fae343155a4184f4187076362deed..29e4bc2ede586fa1cef90b07e680e2e8223861d0 100644 (file)
--- a/contrib/slapd-modules/autogroup/autogroup.c
+++ b/contrib/slapd-modules/autogroup/autogroup.c
@@ -1714,7 +1714,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;
        }