diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-11-16 09:00:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:52 -0500 |
| commit | 8a18778286a16423d7d6e483fdb308a91e294efe (patch) | |
| tree | b1cf6a44c1cb4deccb04897ab426a724204b3f52 /source4/ldap_server | |
| parent | e81157c7379116d83b9906e27c9fd418c779d129 (diff) | |
| download | samba-8a18778286a16423d7d6e483fdb308a91e294efe.tar.gz samba-8a18778286a16423d7d6e483fdb308a91e294efe.tar.bz2 samba-8a18778286a16423d7d6e483fdb308a91e294efe.zip | |
r3783: - don't use make proto for ldb anymore
- split ldh.h out of samba's includes.h
- make ldb_context and ldb_module private to the subsystem
- use ltdb_ prefix for all ldb_tdb functions
metze
(This used to be commit f5ee40d6ce8224e280070975efc9911558fe675c)
Diffstat (limited to 'source4/ldap_server')
| -rw-r--r-- | source4/ldap_server/ldap_rootdse.c | 6 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_simple_ldb.c | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/ldap_server/ldap_rootdse.c b/source4/ldap_server/ldap_rootdse.c index 2b9efa11b4..5780809c78 100644 --- a/source4/ldap_server/ldap_rootdse.c +++ b/source4/ldap_server/ldap_rootdse.c @@ -22,6 +22,7 @@ #include "dynconfig.h" #include "ldap_server/ldap_server.h" #include "system/time.h" +#include "lib/ldb/include/ldb.h" #define ATTR_BLOB_CONST(val) data_blob_talloc(mem_ctx, val, sizeof(val)-1) #define ATTR_SINGLE_NOVAL(ctx, attr, blob, num, nam) do { \ @@ -47,7 +48,8 @@ struct rootdse_db_context { /* this is used to catch debug messages from ldb */ -void rootdse_db_debug(void *context, enum ldb_debug_level level, const char *fmt, va_list ap) _PRINTF_ATTRIBUTE(3,0) +static void rootdse_db_debug(void *context, enum ldb_debug_level level, const char *fmt, va_list ap) PRINTF_ATTRIBUTE(3,0); +static void rootdse_db_debug(void *context, enum ldb_debug_level level, const char *fmt, va_list ap) { char *s = NULL; if (DEBUGLEVEL < 4 && level > LDB_DEBUG_WARNING) { @@ -73,7 +75,7 @@ static int rootdse_db_destructor(void *ctx) connect to the SAM database return an opaque context pointer on success, or NULL on failure */ -void *rootdse_db_connect(TALLOC_CTX *mem_ctx) +static void *rootdse_db_connect(TALLOC_CTX *mem_ctx) { static struct rootdse_db_context *ctx; char *db_path; diff --git a/source4/ldap_server/ldap_simple_ldb.c b/source4/ldap_server/ldap_simple_ldb.c index 4edd456c6e..1b000f53ea 100644 --- a/source4/ldap_server/ldap_simple_ldb.c +++ b/source4/ldap_server/ldap_simple_ldb.c @@ -22,6 +22,7 @@ #include "includes.h" #include "ldap_server/ldap_server.h" #include "ldap_parse.h" +#include "lib/ldb/include/ldb.h" /* TODO: samdb_context is not a pulblic struct */ struct samdb_context { |