sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

r22681: Fix standalone ldb build when parent directory name != ldb.

Browse Source 
(This used to be commit 1093875d59f1ea9b8bd82277d4f9d8366e584952)
This commit is contained in:
Jelmer Vernooij 2007-05-05 18:50:56 +00:00 committed by Gerald (Jerry) Carter
parent be7eb080fe
commit 52fb06edc2
49 changed files with 113 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/dsdb/samdb/ldb_modules/objectguid.c
View File

@ -35,7 +35,7 @@
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb/include/ldb_includes.h"
#include "librpc/gen_ndr/ndr_misc.h"
static struct ldb_message_element *objectguid_find_attribute(const struct ldb_message *msg, const char *name)

2
source4/dsdb/samdb/ldb_modules/partition.c
View File

@ -36,7 +36,7 @@
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb/include/ldb_includes.h"
#include "dsdb/samdb/samdb.h"
struct partition_private_data {

2
source4/dsdb/samdb/ldb_modules/update_keytab.c
View File

@ -29,7 +29,7 @@
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb/include/ldb_includes.h"
#include "auth/credentials/credentials.h"
#include "auth/credentials/credentials_krb5.h"
#include "system/kerberos.h"

5
source4/lib/ldb/common/attrib_handlers.c
View File

@ -26,10 +26,9 @@
see rfc2252
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "system/locale.h"
#include "ldb/include/ldb_handlers.h"
#include "ldb_handlers.h"
/*
default handler that just copies a ldb_val.

3
source4/lib/ldb/common/ldb.c
View File

@ -33,8 +33,7 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
/*
initialise a ldb context

3
source4/lib/ldb/common/ldb_attributes.c
View File

@ -29,8 +29,7 @@
message matching logic generic
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
/*
add a attribute to the ldb_schema

3
source4/lib/ldb/common/ldb_controls.c
View File

@ -32,8 +32,7 @@
* Author: Simo Sorce
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
/* check if a control with the specified "oid" exist and return it */
/* returns NULL if not found */

3
source4/lib/ldb/common/ldb_debug.c
View File

@ -32,8 +32,7 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
/*
this allows the user to choose their own debug function

3
source4/lib/ldb/common/ldb_dn.c
View File

@ -34,9 +34,8 @@
* Author: Simo Sorce
*/
#include "includes.h"
#include <ctype.h>
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#define LDB_DN_NULL_FAILED(x) if (!(x)) goto failed

3
source4/lib/ldb/common/ldb_ldif.c
View File

@ -36,8 +36,7 @@
see RFC2849 for the LDIF format definition
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "system/locale.h"
/*

3
source4/lib/ldb/common/ldb_match.c
View File

@ -33,8 +33,7 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
/*
check if the scope matches in a search result

4
source4/lib/ldb/common/ldb_modules.c
View File

@ -33,10 +33,10 @@
* Author: Simo Sorce
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#if (_SAMBA_BUILD_ >= 4)
#include "includes.h"
#include "build.h"
#include "dynconfig.h"
#endif

3
source4/lib/ldb/common/ldb_msg.c
View File

@ -32,8 +32,7 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
/*
create a new ldb_message in a given memory context (NULL for top level)

3
source4/lib/ldb/common/ldb_parse.c
View File

@ -41,8 +41,7 @@
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "system/locale.h"
/*

3
source4/lib/ldb/common/ldb_utf8.c
View File

@ -32,8 +32,7 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "system/locale.h"

3
source4/lib/ldb/common/qsort.c
View File

@ -25,8 +25,7 @@
* Simo Sorce <idra@samba.org> 2005
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
/* Byte-wise swap two items of size SIZE. */
#define SWAP(a, b, size) \

16
source4/lib/ldb/config.mk
View File

@ -2,6 +2,7 @@
# Start MODULE ldb_asq
[MODULE::ldb_asq]
PRIVATE_DEPENDENCIES = LIBTALLOC
CFLAGS = -Ilib/ldb/include
INIT_FUNCTION = ldb_asq_init
SUBSYSTEM = ldb
OBJ_FILES = \
@ -13,6 +14,7 @@ OBJ_FILES = \
# Start MODULE ldb_server_sort
[MODULE::ldb_server_sort]
PRIVATE_DEPENDENCIES = LIBTALLOC
CFLAGS = -Ilib/ldb/include
INIT_FUNCTION = ldb_sort_init
SUBSYSTEM = ldb
OBJ_FILES = \
@ -24,6 +26,7 @@ OBJ_FILES = \
# Start MODULE ldb_paged_results
[MODULE::ldb_paged_results]
INIT_FUNCTION = ldb_paged_results_init
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
SUBSYSTEM = ldb
OBJ_FILES = \
@ -35,6 +38,7 @@ OBJ_FILES = \
# Start MODULE ldb_paged_results
[MODULE::ldb_paged_searches]
INIT_FUNCTION = ldb_paged_searches_init
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
SUBSYSTEM = ldb
OBJ_FILES = \
@ -46,6 +50,7 @@ OBJ_FILES = \
# Start MODULE ldb_operational
[MODULE::ldb_operational]
SUBSYSTEM = ldb
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
INIT_FUNCTION = ldb_operational_init
OBJ_FILES = \
@ -57,6 +62,7 @@ OBJ_FILES = \
# Start MODULE ldb_objectclass
[MODULE::ldb_objectclass]
INIT_FUNCTION = ldb_objectclass_init
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
SUBSYSTEM = ldb
OBJ_FILES = \
@ -68,6 +74,7 @@ OBJ_FILES = \
# Start MODULE ldb_rdn_name
[MODULE::ldb_rdn_name]
SUBSYSTEM = ldb
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
INIT_FUNCTION = ldb_rdn_name_init
OBJ_FILES = \
@ -79,6 +86,7 @@ OBJ_FILES = \
# Start MODULE ldb_ildap
[MODULE::ldb_ildap]
SUBSYSTEM = ldb
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP
INIT_FUNCTION = ldb_ildap_init
ALIASES = ldapi ldaps ldap
@ -91,6 +99,7 @@ OBJ_FILES = \
# Start MODULE ldb_map
[MODULE::ldb_map]
PRIVATE_DEPENDENCIES = LIBTALLOC
CFLAGS = -Ilib/ldb/include -Ilib/ldb/modules
SUBSYSTEM = ldb
OBJ_FILES = \
modules/ldb_map_inbound.o \
@ -103,6 +112,7 @@ OBJ_FILES = \
# Start MODULE ldb_skel
[MODULE::ldb_skel]
SUBSYSTEM = ldb
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
INIT_FUNCTION = ldb_skel_init
OBJ_FILES = modules/skel.o
@ -113,6 +123,7 @@ OBJ_FILES = modules/skel.o
# Start MODULE ldb_sqlite3
[MODULE::ldb_sqlite3]
SUBSYSTEM = ldb
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC SQLITE3 LIBTALLOC
INIT_FUNCTION = ldb_sqlite3_init
OBJ_FILES = \
@ -124,6 +135,7 @@ OBJ_FILES = \
# Start MODULE ldb_tdb
[MODULE::ldb_tdb]
SUBSYSTEM = ldb
CFLAGS = -Ilib/ldb/include -Ilib/ldb/ldb_tdb
INIT_FUNCTION = ldb_tdb_init
OBJ_FILES = \
ldb_tdb/ldb_tdb.o \
@ -139,13 +151,14 @@ PRIVATE_DEPENDENCIES = \
./lib/ldb/common/ldb_modules.o: lib/ldb/common/ldb_modules.c Makefile
@echo Compiling $<
@$(CC) -Iinclude $(CFLAGS) -Ilib/replace -Ilib/talloc -Ilib/ldb $(PICFLAG) -DLDBMODULESDIR=\"$(MODULESDIR)/ldb\" -DSHLIBEXT=\"$(SHLIBEXT)\" -c $< -o $@
@$(CC) -Iinclude $(CFLAGS) -Ilib/replace -Ilib/talloc -Ilib/ldb/include $(PICFLAG) -DLDBMODULESDIR=\"$(MODULESDIR)/ldb\" -DSHLIBEXT=\"$(SHLIBEXT)\" -c $< -o $@
################################################
# Start SUBSYSTEM ldb
[LIBRARY::ldb]
VERSION = 0.0.1
SO_VERSION = 0
CFLAGS = -Ilib/ldb/include
DESCRIPTION = LDAP-like embedded database library
INIT_FUNCTION_TYPE = int (*) (void)
OBJ_FILES = \
@ -177,6 +190,7 @@ PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h
# Start SUBSYSTEM LDBSAMBA
[SUBSYSTEM::LDBSAMBA]
PRIVATE_DEPENDENCIES = ldb
CFLAGS = -Ilib/ldb/include
PRIVATE_PROTO_HEADER = samba/ldif_handlers.h
PRIVATE_DEPENDENCIES = LIBSECURITY SAMDB
OBJ_FILES = \

6
source4/lib/ldb/examples/ldbreader.c
View File

@ -31,9 +31,9 @@ It lists / dumps the records in a LDB database to standard output.
*/
#include "includes.h"
#include "ldb/include/ldb.h"
#include "ldb/include/ldb_errors.h"
#include "ldb_includes.h"
#include "ldb.h"
#include "ldb_errors.h"
/*
ldb_ldif_write takes a function pointer to a custom output

6
source4/lib/ldb/examples/ldifreader.c
View File

@ -31,9 +31,9 @@ It lists / dumps the entries in an LDIF file to standard output.
*/
#include "includes.h"
#include "ldb/include/ldb.h"
#include "ldb/include/ldb_errors.h"
#include "ldb_includes.h"
#include "ldb.h"
#include "ldb_errors.h"
/*
ldb_ldif_write takes a function pointer to a custom output

0
source4/lib/ldb/include/includes.h → source4/lib/ldb/include/ldb_includes.h
View File

2
source4/lib/ldb/ldb_ildap/ldb_ildap.c
View File

@ -43,7 +43,7 @@
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "lib/events/events.h"
#include "libcli/ldap/ldap.h"

3
source4/lib/ldb/ldb_ldap/ldb_ldap.c
View File

@ -39,8 +39,7 @@
* author: Simo Sorce
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#define LDAP_DEPRECATED 1
#include <ldap.h>

5
source4/lib/ldb/ldb_tdb/ldb_cache.c
View File

@ -32,10 +32,9 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "ldb/ldb_tdb/ldb_tdb.h"
#include "ldb_tdb.h"
#define LTDB_FLAG_CASE_INSENSITIVE (1<<0)
#define LTDB_FLAG_INTEGER (1<<1)

5
source4/lib/ldb/ldb_tdb/ldb_index.c
View File

@ -32,10 +32,9 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "ldb/ldb_tdb/ldb_tdb.h"
#include "ldb_tdb.h"
/*
find an element in a list, using the given comparison function and

6
source4/lib/ldb/ldb_tdb/ldb_pack.c
View File

@ -32,10 +32,8 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb/ldb_tdb/ldb_tdb.h"
#include "ldb_includes.h"
#include "ldb_tdb.h"
/* change this if the data format ever changes */
#define LTDB_PACKING_FORMAT 0x26011967

5
source4/lib/ldb/ldb_tdb/ldb_search.c
View File

@ -32,10 +32,9 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "ldb/ldb_tdb/ldb_tdb.h"
#include "ldb_tdb.h"
/*
add one element to a message

5
source4/lib/ldb/ldb_tdb/ldb_tdb.c
View File

@ -42,10 +42,9 @@
* Author: Simo Sorce
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "ldb/ldb_tdb/ldb_tdb.h"
#include "ldb_tdb.h"
/*

5
source4/lib/ldb/ldb_tdb/ldb_tdb_wrap.c
View File

@ -22,10 +22,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "ldb/ldb_tdb/ldb_tdb.h"
#include "ldb_tdb.h"
/*
the purpose of this code is to work around the braindead posix locking

3
source4/lib/ldb/modules/asq.c
View File

@ -33,8 +33,7 @@
* Author: Simo Sorce
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
struct asq_context {

33
source4/lib/ldb/modules/ldb_map.c
View File

@ -34,11 +34,14 @@
* Author: Jelmer Vernooij, Martin Kuehl
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "ldb/modules/ldb_map.h"
#include "ldb/modules/ldb_map_private.h"
#include "ldb_map.h"
#include "ldb_map_private.h"
#ifndef _PUBLIC_
#define _PUBLIC_
#endif
/* Description of the provided ldb requests:
- special attribute 'isMapped'
@ -170,15 +173,15 @@ struct ldb_handle *map_init_handle(struct ldb_request *req, struct ldb_module *m
* ========================================= */
/* Check whether any data should be stored in the local partition. */
BOOL map_check_local_db(struct ldb_module *module)
bool map_check_local_db(struct ldb_module *module)
{
const struct ldb_map_context *data = map_get_context(module);
if (!data->remote_base_dn || !data->local_base_dn) {
return False;
return false;
}
return True;
return true;
}
/* Copy a DN with the base DN of the local partition. */
@ -386,18 +389,18 @@ const struct ldb_map_attribute *map_attr_find_remote(const struct ldb_map_contex
* ================== */
/* Check whether an attribute will be mapped into the remote partition. */
BOOL map_attr_check_remote(const struct ldb_map_context *data, const char *attr)
bool map_attr_check_remote(const struct ldb_map_context *data, const char *attr)
{
const struct ldb_map_attribute *map = map_attr_find_local(data, attr);
if (map == NULL) {
return False;
return false;
}
if (map->type == MAP_IGNORE) {
return False;
return false;
}
return True;
return true;
}
/* Map an attribute name into the remote partition. */
@ -489,12 +492,12 @@ struct ldb_val ldb_val_map_remote(struct ldb_module *module, void *mem_ctx,
* =========== */
/* Check whether a DN is below the local baseDN. */
BOOL ldb_dn_check_local(struct ldb_module *module, struct ldb_dn *dn)
bool ldb_dn_check_local(struct ldb_module *module, struct ldb_dn *dn)
{
const struct ldb_map_context *data = map_get_context(module);
if (!data->local_base_dn) {
return True;
return true;
}
return ldb_dn_compare_base(data->local_base_dn, dn) == 0;
@ -736,7 +739,7 @@ static void map_objectclass_generate_remote(struct ldb_module *module, const cha
{
struct ldb_message_element *el, *oc;
struct ldb_val val;
BOOL found_extensibleObject = False;
bool found_extensibleObject = false;
int i;
/* Find old local objectClass */
@ -768,7 +771,7 @@ static void map_objectclass_generate_remote(struct ldb_module *module, const cha
for (i = 0; i < el->num_values - 1; i++) {
el->values[i] = map_objectclass_convert_local(module, el->values, &oc->values[i]);
if (ldb_attr_cmp((char *)el->values[i].data, "extensibleObject") == 0) {
found_extensibleObject = True;
found_extensibleObject = true;
}
}

13
source4/lib/ldb/modules/ldb_map_inbound.c
View File

@ -23,11 +23,10 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "ldb/modules/ldb_map.h"
#include "ldb/modules/ldb_map_private.h"
#include "ldb_map.h"
#include "ldb_map_private.h"
/* Mapping message elements
@ -137,10 +136,10 @@ local:
* ================ */
/* Check whether a message will be (partially) mapped into the remote partition. */
static BOOL ldb_msg_check_remote(struct ldb_module *module, const struct ldb_message *msg)
static bool ldb_msg_check_remote(struct ldb_module *module, const struct ldb_message *msg)
{
const struct ldb_map_context *data = map_get_context(module);
BOOL ret;
bool ret;
int i;
for (i = 0; i < msg->num_elements; i++) {
@ -150,7 +149,7 @@ static BOOL ldb_msg_check_remote(struct ldb_module *module, const struct ldb_mes
}
}
return False;
return false;
}
/* Split message elements that stay in the local partition from those

15
source4/lib/ldb/modules/ldb_map_outbound.c
View File

@ -24,11 +24,10 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#include "ldb/modules/ldb_map.h"
#include "ldb/modules/ldb_map_private.h"
#include "ldb_map.h"
#include "ldb_map_private.h"
/* Mapping attributes
@ -488,10 +487,10 @@ static int map_reply_remote(struct map_context *ac, struct ldb_reply *ares)
* =================== */
/* Check whether a parse tree can safely be split in two. */
static BOOL ldb_parse_tree_check_splittable(const struct ldb_parse_tree *tree)
static bool ldb_parse_tree_check_splittable(const struct ldb_parse_tree *tree)
{
const struct ldb_parse_tree *subtree = tree;
BOOL negate = False;
bool negate = false;
while (subtree) {
switch (subtree->operation) {
@ -507,11 +506,11 @@ static BOOL ldb_parse_tree_check_splittable(const struct ldb_parse_tree *tree)
return negate; /* if negate: True */
default:
return True; /* simple parse tree */
return true; /* simple parse tree */
}
}
return True; /* no parse tree */
return true; /* no parse tree */
}
/* Collect a list of attributes required to match a given parse tree. */

6
source4/lib/ldb/modules/ldb_map_private.h
View File

@ -68,9 +68,9 @@ struct ldb_handle *map_init_handle(struct ldb_request *req, struct ldb_module *m
int ldb_next_remote_request(struct ldb_module *module, struct ldb_request *request);
BOOL map_check_local_db(struct ldb_module *module);
BOOL map_attr_check_remote(const struct ldb_map_context *data, const char *attr);
BOOL ldb_dn_check_local(struct ldb_module *module, struct ldb_dn *dn);
bool map_check_local_db(struct ldb_module *module);
bool map_attr_check_remote(const struct ldb_map_context *data, const char *attr);
bool ldb_dn_check_local(struct ldb_module *module, struct ldb_dn *dn);
const struct ldb_map_attribute *map_attr_find_local(const struct ldb_map_context *data, const char *name);
const struct ldb_map_attribute *map_attr_find_remote(const struct ldb_map_context *data, const char *name);

3
source4/lib/ldb/modules/objectclass.c
View File

@ -33,8 +33,7 @@
* Author: Andrew Bartlett
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
struct oc_context {

3
source4/lib/ldb/modules/operational.c
View File

@ -74,8 +74,7 @@
modifiersName: not supported by w2k3?
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
/*
construct a canonical name from a message

3
source4/lib/ldb/modules/paged_results.c
View File

@ -33,8 +33,7 @@
* Author: Simo Sorce
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
struct message_store {
/* keep the whole ldb_reply as an optimization

2
source4/lib/ldb/modules/paged_searches.c
View File

@ -34,7 +34,7 @@
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
#define PS_DEFAULT_PAGE_SIZE 500
/* 500 objects per query seem to be a decent compromise

3
source4/lib/ldb/modules/rdn_name.c
View File

@ -37,8 +37,7 @@
* Simo Sorce Mar 2006
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
static struct ldb_message_element *rdn_name_find_attribute(const struct ldb_message *msg, const char *name)
{

3
source4/lib/ldb/modules/skel.c
View File

@ -32,8 +32,7 @@
* Author: Simo Sorce
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
struct private_data {

3
source4/lib/ldb/modules/sort.c
View File

@ -32,8 +32,7 @@
* Author: Simo Sorce
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
struct opaque {
struct ldb_context *ldb;

4
source4/lib/ldb/samba/ldif_handlers.c
View File

@ -23,8 +23,8 @@
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb/include/ldb_handlers.h"
#include "ldb_includes.h"
#include "ldb_handlers.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "librpc/gen_ndr/ndr_misc.h"

3
source4/lib/ldb/tools/convert.c
View File

@ -23,8 +23,7 @@
*/
#include "convert.h"
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb_includes.h"
/* Shared map for converting syntax between formats */
static const struct syntax_map syntax_map[] = {

5
source4/lib/ldb/tools/ldbdel.c
View File

@ -32,9 +32,8 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb/tools/cmdline.h"
#include "ldb_includes.h"
#include "tools/cmdline.h"
static int ldb_delete_recursive(struct ldb_context *ldb, struct ldb_dn *dn)
{

5
source4/lib/ldb/tools/ldbedit.c
View File

@ -32,9 +32,8 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb/tools/cmdline.h"
#include "ldb_includes.h"
#include "tools/cmdline.h"
static struct ldb_cmdline *options;

5
source4/lib/ldb/tools/ldbmodify.c
View File

@ -32,9 +32,8 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb/tools/cmdline.h"
#include "ldb_includes.h"
#include "tools/cmdline.h"
static int failures;

5
source4/lib/ldb/tools/ldbrename.c
View File

@ -34,9 +34,8 @@
* Author: Stefan Metzmacher
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb/tools/cmdline.h"
#include "ldb_includes.h"
#include "tools/cmdline.h"
static void usage(void)
{

5
source4/lib/ldb/tools/ldbsearch.c
View File

@ -32,9 +32,8 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb/tools/cmdline.h"
#include "ldb_includes.h"
#include "tools/cmdline.h"
static void usage(void)
{

5
source4/lib/ldb/tools/ldbtest.c
View File

@ -32,9 +32,8 @@
* Author: Andrew Tridgell
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb/tools/cmdline.h"
#include "ldb_includes.h"
#include "tools/cmdline.h"
static struct timeval tp1,tp2;
static struct ldb_cmdline *options;

7
source4/lib/ldb/tools/oLschema2ldif.c
View File

@ -32,10 +32,9 @@
* Author: Simo Sorce
*/
#include "includes.h"
#include "ldb/include/includes.h"
#include "ldb/tools/cmdline.h"
#include "ldb/tools/convert.h"
#include "ldb_includes.h"
#include "tools/cmdline.h"
#include "tools/convert.h"
#define SCHEMA_UNKNOWN 0
#define SCHEMA_NAME 1