ITS#9020 Reinstate olcAutomaticGroups and document its deprecation

diff --git a/contrib/slapd-modules/autogroup/autogroup.c b/contrib/slapd-modules/autogroup/autogroup.c
index 926703f881467dea70de20e4d75a2fe71d253948..cbcedfebf6c2f3a5d65ff342cfe5a0f58a967251 100644 (file)
--- a/contrib/slapd-modules/autogroup/autogroup.c
+++ b/contrib/slapd-modules/autogroup/autogroup.c
@@ -1733,7 +1733,7 @@ static ConfigTable agcfg[] = {
 
 static ConfigOCs agocs[] = {
        { "( OLcfgCtOc:2.1 "
-               "NAME 'olcAutoGroupConfig' "
+               "NAME ( 'olcAutoGroupConfig' 'olcAutomaticGroups' ) "
                "DESC 'Automatic groups configuration' "
                "SUP olcOverlayConfig "
                "MAY ( "

diff --git a/contrib/slapd-modules/autogroup/slapo-autogroup.5 b/contrib/slapd-modules/autogroup/slapo-autogroup.5
index 86fa1a1938a62636dd84ecc37f9645a6a8ce5cc6..4c6414d3ec178a51011259c12cce962042e07418 100644 (file)
--- a/contrib/slapd-modules/autogroup/slapo-autogroup.5
+++ b/contrib/slapd-modules/autogroup/slapo-autogroup.5
@@ -93,10 +93,15 @@ The autogroup overlay has been reworked with the 2.5 release to use
 a consistent namespace as with other overlays. As a side-effect the
 following cn=config parameters are deprecated and will be removed in
 a future release:
+.IP \[bu] 2
 .B olcAGattrSet
 is replaced with olcAutoGroupAttrSet
+.IP \[bu]
 .B olcAGmemberOfAd
 is replaced with olcAutoGroupMemberOfAd
+.IP \[bu]
+.B olcAutomaticGroups
+is replaced with olcAutoGroupConfig
 .SH ACKNOWLEDGEMENTS
 This module was originally written in 2007 by Michał
 Szulczyński.  Further enhancements were contributed by Howard