Sync with devel version.

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index c8ad754d6193d25e4c4f1ee895b71f478479dd17..d76c7df89c2b613f1267a764b6ea7c9e08f4ed4d 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -15,6 +15,8 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
+#include "ldap_pvt.h"
+
 #include "slap.h"
 
 /* protected by connections_mutex */

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 59c4143b77bbabb7bfccff5bc8ac2909d6c8bb75..b6cf134bbe8f8b9ce08161ee2e33ff7b91e144b2 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -376,8 +376,8 @@ static Listener * open_listener( const char* url )
 #endif
 
 #ifdef LDAP_PF_LOCAL
-       /* for IP sockets only */
-       if ( l.sl_sa.sa_addr.sa_family == AF_INET ) {
+       /* for IPv4 and IPv6 sockets only */
+       if ( l.sl_sa.sa_addr.sa_family != AF_LOCAL ) {
 #endif /* LDAP_PF_LOCAL */
 #endif /* HAVE_GETADDRINFO */
 

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index c9d765b0c838e5c84a31fa7712080141c26f09b0..7ccce7fd77c3645abf4c3adcd63108434be07c83 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -112,6 +112,9 @@ usage( char *name )
                "\t-l sysloguser\tSyslog User (default: LOCAL4)\n"
 #endif
                "\t-n serverName\tservice name\n"
+#ifdef HAVE_CHROOT
+               "\t-r directory\n"
+#endif
                "\t-s level\tSyslog Level\n"
 #ifdef SLAPD_BDB2
                "\t-t\t\tEnable BDB2 timing\n"

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 814004e67c362dd008bb35860a132ea54d5f9bc6..9ca8ca582616efb2b94e7b9be95e092e38961cd4 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -2027,7 +2027,7 @@ struct syntax_defs_rec syntax_defs[] = {
        {"( 1.3.6.1.4.1.1466.115.121.1.27 DESC 'Integer' )",
                0, integerValidate, integerNormalize, integerPretty},
        {"( 1.3.6.1.4.1.1466.115.121.1.28 DESC 'JPEG' " X_NOT_H_R ")",
-               SLAP_SYNTAX_BLOB, NULL, NULL, NULL},
+               SLAP_SYNTAX_BLOB, blobValidate, NULL, NULL},
        {"( 1.3.6.1.4.1.1466.115.121.1.29 DESC 'Master And Shadow Access Points' )",
                0, NULL, NULL, NULL},
        {"( 1.3.6.1.4.1.1466.115.121.1.30 DESC 'Matching Rule Description' )",