Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

doc/guide/admin/dbtools.sdf

@@ -331,7 +331,7 @@ You can also specify a {{TERM:URL}} containing the attribute value.
 For example, the following specifies the {{EX:jpegPhoto}} value
 should be obtained from the file {{F:/path/to/file.jpeg}}.
 
->	cn:< file:///path/to/file.jpeg
+>	jpegPhoto:< file:///path/to/file.jpeg
 
 Multiple entries within the same LDIF file are separated by blank
 lines. Here's an example of an LDIF file containing three entries.

libraries/libldap/msctrl.c

@@ -264,7 +264,7 @@ ldap_create_extended_dn_control(
 #ifdef LDAP_CONTROL_X_SERVER_NOTIFICATION
 
 int
-ldap_create_sever_notification_control( LDAP *ld,
+ldap_create_server_notification_control( LDAP *ld,
                                     LDAPControl **ctrlp )
 {
 	assert( ld != NULL );

servers/lloadd/config.c

@@ -45,7 +45,7 @@
 #include "lload.h"
 #include "lutil.h"
 #include "lutil_ldap.h"
-#include "config.h"
+#include "lload-config.h"
 
 #ifdef _WIN32
 #define LUTIL_ATOULX lutil_atoullx

servers/lloadd/config.h → servers/lloadd/lload-config.h

-/* config.h - configuration abstraction structure */
+/* lload-config.h - configuration abstraction structure */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
@@ -18,7 +18,7 @@
 #define LLOAD_CONFIG_H
 
 #include <ac/string.h>
-#include "../slapd/config.h"
+#include "../slapd/slap-config.h"
 
 LDAP_BEGIN_DECL
 

servers/lloadd/lload.h

@@ -167,7 +167,7 @@ struct LloadChange {
         enum lcf_backend backend;
     } flags;
     void *target;
-} lload_change;
+};
 
 typedef enum {
 #ifdef LDAP_API_FEATURE_VERIFY_CREDENTIALS

servers/lloadd/module_init.c

@@ -33,7 +33,7 @@
 #include <ac/time.h>
 
 #include "../servers/slapd/slap.h"
-#include "../servers/slapd/config.h"
+#include "../servers/slapd/slap-config.h"
 
 #include "lload.h"
 #include "lber_pvt.h"

servers/lloadd/monitor.c

@@ -36,7 +36,7 @@
 #include "lber_pvt.h"
 
 #include "ldap_rq.h"
-#include "config.h"
+#include "lload-config.h"
 #include "../slapd/back-monitor/back-monitor.h"
 
 #define LLOAD_MONITOR_BALANCER_NAME "Load Balancer"

servers/lloadd/proto-lload.h

@@ -123,6 +123,7 @@ LDAP_SLAPD_V (struct evdns_base *) dnsbase;
 LDAP_SLAPD_V (volatile sig_atomic_t) slapd_shutdown;
 LDAP_SLAPD_V (volatile sig_atomic_t) slapd_gentle_shutdown;
 LDAP_SLAPD_V (int) lloadd_inited;
+LDAP_SLAPD_V (struct LloadChange) lload_change;
 
 LDAP_SLAPD_V (struct event *) lload_timeout_event;
 

servers/slapd/back-asyncmeta/config.c

@@ -29,7 +29,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 #include "ldif.h"
 #include "../back-ldap/back-ldap.h"

servers/slapd/back-asyncmeta/init.c

@@ -28,7 +28,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "../back-ldap/back-ldap.h"
 #include "back-asyncmeta.h"
 

servers/slapd/back-dnssrv/init.c

@@ -28,7 +28,7 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "proto-dnssrv.h"
 
 int

servers/slapd/back-ldap/chain.c

@@ -30,7 +30,7 @@
 #include "lutil.h"
 #include "slap.h"
 #include "back-ldap.h"
-#include "config.h"
+#include "slap-config.h"
 
 #ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
 #define SLAP_CHAINING_DEFAULT				LDAP_CHAINING_PREFERRED

servers/slapd/back-ldap/config.c

@@ -30,7 +30,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "back-ldap.h"
 #include "lutil.h"
 #include "ldif.h"

servers/slapd/back-ldap/distproc.c

@@ -33,7 +33,7 @@
 
 #include "back-ldap.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 /*
  * From <draft-sermersheim-ldap-distproc>

servers/slapd/back-ldap/init.c

@@ -29,7 +29,7 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "config.h"
+#include "slap-config.h"
 #include "back-ldap.h"
 
 static const ldap_extra_t ldap_extra = {

servers/slapd/back-ldap/monitor.c

@@ -32,7 +32,7 @@
 #include "lutil.h"
 #include "back-ldap.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 static ObjectClass		*oc_olmLDAPDatabase;
 static ObjectClass		*oc_olmLDAPConnection;

servers/slapd/back-ldap/pbind.c

@@ -29,7 +29,7 @@
 #include "lutil.h"
 #include "slap.h"
 #include "back-ldap.h"
-#include "config.h"
+#include "slap-config.h"
 
 static BackendInfo	*lback;
 

servers/slapd/back-ldif/ldif.c

@@ -29,7 +29,7 @@
 #include <ac/unistd.h>
 #include "slap.h"
 #include "lutil.h"
-#include "config.h"
+#include "slap-config.h"
 
 struct ldif_tool {
 	Entry	**entries;			/* collected by bi_tool_entry_first() */

servers/slapd/back-mdb/attr.c

@@ -23,7 +23,7 @@
 
 #include "slap.h"
 #include "back-mdb.h"
-#include "config.h"
+#include "slap-config.h"
 #include "lutil.h"
 
 /* Find the ad, return -1 if not found,

servers/slapd/back-mdb/config.c

@@ -24,7 +24,7 @@
 #include "back-mdb.h"
 #include "idl.h"
 
-#include "config.h"
+#include "slap-config.h"
 
 #include "lutil.h"
 #include "ldap_rq.h"