mirror of
https://github.com/samba-team/samba.git
synced 2025-11-20 08:23:50 +03:00
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 commit is contained in:
committed by
Gerald (Jerry) Carter
parent
9003698e0f
commit
f5ee40d6ce
@@ -34,6 +34,8 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
#include "ldb/include/ldb.h"
|
||||
#include "ldb/include/ldb_private.h"
|
||||
#include "dlinklist.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
@@ -82,10 +84,10 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
|
||||
|
||||
if (!modules && strcmp("ldap", ldb->modules->ops->name)) { /* no modules in the options, look for @MODULES in the db (not for ldap) */
|
||||
int ret, j, k;
|
||||
char * attrs[] = { "@MODULE" };
|
||||
const char * const attrs[] = { "@MODULE" , NULL};
|
||||
struct ldb_message **msg;
|
||||
|
||||
ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", (const char * const *)attrs, &msg);
|
||||
ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", attrs, &msg);
|
||||
if (ret == 0) {
|
||||
ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
|
||||
} else {
|
||||
@@ -144,7 +146,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
|
||||
#ifdef HAVE_DLOPEN_DISABLED
|
||||
{
|
||||
void *handle;
|
||||
init_ldb_module_function init;
|
||||
ldb_module_init_function init;
|
||||
struct stat st;
|
||||
const char *errstr;
|
||||
|
||||
@@ -160,7 +162,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
|
||||
return -1;
|
||||
}
|
||||
|
||||
init = (init_ldb_module_function)dlsym(handle, "init_module");
|
||||
init = (ldb_module_init_function)dlsym(handle, "init_module");
|
||||
|
||||
errstr = dlerror();
|
||||
if (errstr) {
|
||||
|
||||
Reference in New Issue
Block a user