Commit eae8956b authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

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

parents 8ab24ff0 44e36a49
......@@ -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.
......
......@@ -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 );
......
......@@ -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
......
/* 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
......
......@@ -167,7 +167,7 @@ struct LloadChange {
enum lcf_backend backend;
} flags;
void *target;
} lload_change;
};
typedef enum {
#ifdef LDAP_API_FEATURE_VERIFY_CREDENTIALS
......
......@@ -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"
......
......@@ -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"
......
......@@ -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;
......
......@@ -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"
......
......@@ -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"
......
......@@ -28,7 +28,7 @@
#include <ac/string.h>
#include "slap.h"
#include "config.h"
#include "slap-config.h"
#include "proto-dnssrv.h"
int
......
......@@ -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
......
......@@ -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"
......
......@@ -33,7 +33,7 @@
#include "back-ldap.h"
#include "config.h"
#include "slap-config.h"
/*
* From <draft-sermersheim-ldap-distproc>
......
......@@ -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 = {
......
......@@ -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;
......
......@@ -29,7 +29,7 @@
#include "lutil.h"
#include "slap.h"
#include "back-ldap.h"
#include "config.h"
#include "slap-config.h"
static BackendInfo *lback;
......
......@@ -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() */
......
......@@ -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,
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment