From 790177f824d2ac66e1e1a260cff6fc1c3e29c5b9 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 17 Aug 2000 21:13:54 +0000 Subject: [PATCH] Sync with devel version. --- servers/slapd/connection.c | 2 ++ servers/slapd/daemon.c | 4 ++-- servers/slapd/main.c | 3 +++ servers/slapd/schema_init.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index c8ad754d61..d76c7df89c 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -15,6 +15,8 @@ #include #include +#include "ldap_pvt.h" + #include "slap.h" /* protected by connections_mutex */ diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c index 59c4143b77..b6cf134bbe 100644 --- 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 c9d765b0c8..7ccce7fd77 100644 --- 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 814004e67c..9ca8ca5826 100644 --- 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' )", -- 2.39.5