ITS#5858

diff --git a/CHANGES b/CHANGES
index 2bc9c188ab425514f479022ccf88366efe36cec0..77615eac6977ebe1b02cdaab1d6c8d55b851c352 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,7 @@ OpenLDAP 2.4.14 Engineering
        Fixed slapd-ldif rename on same DN (ITS#5319)
        Fixed slapd-ldif deadlock (ITS#5329)
        Fixed slapd-meta double response sending (ITS#5854)
+       Fixed slapo-ppolicy to not be global (ITS#5858)
        Updated contrib/addpartial module (ITS#5764)
        Build Environment
                Fixed test049,test050 to work on windows (ITS#5842)

diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index 54607e2e81cc9ef0b136ee7478e5e7624c4ed7a2..05939ce986a3fe47cdbddcd6800a61bef9837709 100644 (file)
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -2094,6 +2094,16 @@ ppolicy_db_init(
 {
        slap_overinst *on = (slap_overinst *) be->bd_info;
 
+       if ( SLAP_ISGLOBALOVERLAY( be ) ) {
+               /* do not allow slapo-ppolicy to be global by now (ITS#5858) */
+               if ( cr ){
+                       snprintf( cr->msg, sizeof(cr->msg), 
+                               "slapo-ppolicy cannot be global" );
+                       fprintf( stderr, "%s\n", cr->msg );
+               }
+               return 1;
+       }
+
        /* Has User Schema been initialized yet? */
        if ( !pwd_UsSchema[0].ad[0] ) {
                const char *err;