Sync with HEAD

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 8a40fe52a7ddf9fff083e68ddcb6f874490921b5..bda792fbf84ae5785885c99288fd3f7a3dc549df 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -628,7 +628,7 @@ wait4child( int sig )
     errno = save_errno;
 }
 
-#endif /* SIGCHLD || SIGCLD */
+#endif /* LDAP_SIGCHLD */
 
 
 #ifdef LOG_LOCAL4

diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf
index 91dab7bdb00c3d1f7460af44b22eeacfcde0e11d..0c39145cde5972b5cafd1fe619a67be8c5add6fe 100644 (file)
--- a/servers/slapd/slapd.conf
+++ b/servers/slapd/slapd.conf
@@ -28,8 +28,9 @@ argsfile      %LOCALSTATEDIR%/slapd.args
 # disallow bind_simple_unprotected
 #
 #      Require integrity protection (prevent hijacking)
-#      Require 112-bit (3DES or better) encryption
-# security ssf=1 ssf=112
+#      Require 112-bit (3DES or better) encryption for updates
+#      Require 63-bit encryption for simple bind
+# security ssf=1 update_ssf=112 simple_bind=64
 
 # Sample access control policy:
 #      Allow read access of root DSE