diff options
| -rw-r--r-- | source4/lib/basic.mk | 1 | ||||
| -rw-r--r-- | source4/lib/db_wrap.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb-samba/README (renamed from source4/lib/ldb/samba/README) | 0 | ||||
| -rw-r--r-- | source4/lib/ldb-samba/config.mk (renamed from source4/lib/ldb/samba/config.mk) | 0 | ||||
| -rw-r--r-- | source4/lib/ldb-samba/ldif_handlers.c (renamed from source4/lib/ldb/samba/ldif_handlers.c) | 0 | ||||
| -rw-r--r-- | source4/lib/ldb/common/ldb_modules.c | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_tdb/ldb_tdb.h | 9 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/cmdline.c | 2 |
9 files changed, 4 insertions, 13 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index e993207b00..713fdcede9 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -3,6 +3,7 @@ include samba3/config.mk include socket/config.mk include charset/config.mk include ldb/config.mk +include ldb-samba/config.mk include tls/config.mk include registry/config.mk include policy/config.mk diff --git a/source4/lib/db_wrap.c b/source4/lib/db_wrap.c index ad797fe6a0..92e4758f44 100644 --- a/source4/lib/db_wrap.c +++ b/source4/lib/db_wrap.c @@ -32,7 +32,7 @@ #include "lib/tdb/include/tdb.h" #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" -#include "lib/ldb/samba/ldif_handlers.h" +#include "lib/ldb-samba/ldif_handlers.h" #include "db_wrap.h" #include "dsdb/samdb/samdb.h" #include "param/param.h" diff --git a/source4/lib/ldb/samba/README b/source4/lib/ldb-samba/README index 3fa47159ca..3fa47159ca 100644 --- a/source4/lib/ldb/samba/README +++ b/source4/lib/ldb-samba/README diff --git a/source4/lib/ldb/samba/config.mk b/source4/lib/ldb-samba/config.mk index d29b3f319c..d29b3f319c 100644 --- a/source4/lib/ldb/samba/config.mk +++ b/source4/lib/ldb-samba/config.mk diff --git a/source4/lib/ldb/samba/ldif_handlers.c b/source4/lib/ldb-samba/ldif_handlers.c index cfd79563d5..cfd79563d5 100644 --- a/source4/lib/ldb/samba/ldif_handlers.c +++ b/source4/lib/ldb-samba/ldif_handlers.c diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index b279af98f6..9f94c90c92 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/lib/ldb/common/ldb_modules.c @@ -36,7 +36,6 @@ #if (_SAMBA_BUILD_ >= 4) #include "includes.h" #include "build.h" -#include "dynconfig.h" #endif #define LDB_MODULE_PREFIX "modules:" diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index ec74599fd8..dcc66d3bb0 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -312,5 +312,3 @@ LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT) OBJ_FILES = swig/ldb_wrap.o # End LIBRARY swig_ldb ####################### - -include samba/config.mk diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h index 956f18688b..61b5f789d7 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h @@ -1,11 +1,4 @@ - -#ifdef _SAMBA_BUILD_ -#include "system/filesys.h" -#endif - -#if (_SAMBA_BUILD_ >= 4) -#include "lib/tdb/include/tdb.h" -#elif defined(_SAMBA_BUILD_) +#if (_SAMBA_BUILD_ == 3) #include "tdb/include/tdb.h" #else #include "tdb.h" diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c index 08f5dc721f..2cf8212154 100644 --- a/source4/lib/ldb/tools/cmdline.c +++ b/source4/lib/ldb/tools/cmdline.c @@ -27,7 +27,7 @@ #if (_SAMBA_BUILD_ >= 4) #include "includes.h" #include "lib/cmdline/popt_common.h" -#include "lib/ldb/samba/ldif_handlers.h" +#include "lib/ldb-samba/ldif_handlers.h" #include "auth/gensec/gensec.h" #include "auth/auth.h" #include "db_wrap.h" |