From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 17 Oct 2002 17:06:27 +0000 (+0000)
Subject: Sync with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_1_7~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cbc8b6bc7c398acd4b8fb5e5118f3e108e27ba95;p=openldap

Sync with HEAD
---

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 8a40fe52a7..bda792fbf8 100644
--- 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 91dab7bdb0..0c39145cde 100644
--- 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