The branch, master has been updated
via d93634b7dd753109a5a3621ea7ab610acba8cb65 (commit)
from 01f30a5e8e6d860391e79896f6d1de782e239f68 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d93634b7dd753109a5a3621ea7ab610acba8cb65
Author: Simo Sorce <i...@samba.org>
Date: Fri Jan 30 09:24:48 2009 -0500
Fix misfiled headers.
Some public functions were mistakenly put into ldb_private.h
Revert all modules to only include ldb_module.h
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/samdb/ldb_modules/objectguid.c | 1 -
source4/lib/ldb/include/ldb.h | 15 ++++++++++++---
source4/lib/ldb/include/ldb_private.h | 9 ---------
source4/lib/ldb/ldb_map/ldb_map_outbound.c | 1 -
4 files changed, 12 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/objectguid.c
b/source4/dsdb/samdb/ldb_modules/objectguid.c
index afd8788..46ba8eb 100644
--- a/source4/dsdb/samdb/ldb_modules/objectguid.c
+++ b/source4/dsdb/samdb/ldb_modules/objectguid.c
@@ -35,7 +35,6 @@
#include "includes.h"
#include "ldb_module.h"
-#include "ldb_private.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "param/param.h"
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 589887b..6814649 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -1233,6 +1233,11 @@ int ldb_extended(struct ldb_context *ldb,
struct ldb_result **res);
/**
+ Obtain current/next database sequence number
+*/
+int ldb_sequence_number(struct ldb_context *ldb, enum ldb_sequence_type type,
uint64_t *seq_num);
+
+/**
start a transaction
*/
int ldb_transaction_start(struct ldb_context *ldb);
@@ -1633,6 +1638,8 @@ int ldb_msg_add_fmt(struct ldb_message *msg,
*/
int ldb_msg_element_compare(struct ldb_message_element *el1,
struct ldb_message_element *el2);
+int ldb_msg_element_compare_name(struct ldb_message_element *el1,
+ struct ldb_message_element *el2);
/**
Find elements in a message.
@@ -1746,14 +1753,16 @@ const char **ldb_attr_list_copy(TALLOC_CTX *mem_ctx,
const char * const *attrs);
const char **ldb_attr_list_copy_add(TALLOC_CTX *mem_ctx, const char * const
*attrs, const char *new_attr);
int ldb_attr_in_list(const char * const *attrs, const char *attr);
+int ldb_msg_rename_attr(struct ldb_message *msg, const char *attr, const char
*replace);
+int ldb_msg_copy_attr(struct ldb_message *msg, const char *attr, const char
*replace);
+void ldb_msg_remove_attr(struct ldb_message *msg, const char *attr);
+void ldb_msg_remove_element(struct ldb_message *msg, struct
ldb_message_element *el);
+
void ldb_parse_tree_attr_replace(struct ldb_parse_tree *tree,
const char *attr,
const char *replace);
-int ldb_msg_rename_attr(struct ldb_message *msg, const char *attr, const char
*replace);
-int ldb_msg_copy_attr(struct ldb_message *msg, const char *attr, const char
*replace);
-void ldb_msg_remove_attr(struct ldb_message *msg, const char *attr);
/**
Convert a time structure to a string
diff --git a/source4/lib/ldb/include/ldb_private.h
b/source4/lib/ldb/include/ldb_private.h
index 04ee002..1097708 100644
--- a/source4/lib/ldb/include/ldb_private.h
+++ b/source4/lib/ldb/include/ldb_private.h
@@ -158,17 +158,8 @@ int ldb_comparison_binary(struct ldb_context *ldb, void
*mem_ctx,
/* The following definitions come from lib/ldb/common/ldb_utf8.c */
char *ldb_casefold_default(void *context, void *mem_ctx, const char *s, size_t
n);
-void ldb_msg_remove_element(struct ldb_message *msg, struct
ldb_message_element *el);
-
-int ldb_msg_element_compare_name(struct ldb_message_element *el1,
- struct ldb_message_element *el2);
void ldb_dump_results(struct ldb_context *ldb, struct ldb_result *result, FILE
*f);
-/**
- Obtain current/next database sequence number
-*/
-int ldb_sequence_number(struct ldb_context *ldb, enum ldb_sequence_type type,
uint64_t *seq_num);
-
#define LDB_SEQ_GLOBAL_SEQUENCE 0x01
#define LDB_SEQ_TIMESTAMP_SEQUENCE 0x02
diff --git a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
index edd3f77..327fa92 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
@@ -26,7 +26,6 @@
*/
#include "ldb_module.h"
-#include "ldb_private.h"
#include "ldb_map.h"
#include "ldb_map_private.h"
--
Samba Shared Repository
