Fix ITS#3717 - set restriction on all backends

Fix ITS#4217 - gentleHUP is a normal shutdown condition

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 9d1df57a1255a3f7bcaaa3d6b09ad311faf0ec46..99c2f7c579dfd669d4701ac71bc4edf678f8397b 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1729,9 +1729,13 @@ slapd_daemon_task(
                        ber_socket_t active;
 
                        if( slapd_gentle_shutdown == 1 ) {
+                               BackendDB *be;
                                Debug( LDAP_DEBUG_ANY, "slapd gentle shutdown\n", 0, 0, 0 );
                                close_listeners( 1 );
                                frontendDB->be_restrictops |= SLAP_RESTRICT_OP_WRITES;
+                               LDAP_STAILQ_FOREACH(be, &backendDB, be_next) {
+                                       be->be_restrictops |= SLAP_RESTRICT_OP_WRITES;
+                               }
                                slapd_gentle_shutdown = 2;
                        }
 
@@ -1739,7 +1743,7 @@ slapd_daemon_task(
                        active = slap_daemon.sd_nactives;
                        ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );
                        if( active == 0 ) {
-                               slapd_shutdown = 2;
+                               slapd_shutdown = 1;
                                break;
                        }
                }