summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-05-05 18:59:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:52:01 -0500
commite0e8fc3db45691160b629b0a43753c162be03490 (patch)
tree371400fb01b2eef3be71f3179ad7a8f1a55de032
parent52fb06edc25e8538c413df1aaabba18c859a00cf (diff)
downloadsamba-e0e8fc3db45691160b629b0a43753c162be03490.tar.gz
samba-e0e8fc3db45691160b629b0a43753c162be03490.tar.bz2
samba-e0e8fc3db45691160b629b0a43753c162be03490.zip
r22682: Fix standalone ldb build when parent directory name != ldb.
(This used to be commit 532f28724dcc9e0fe7051e27d145469398041101)
-rw-r--r--source4/lib/ldb/tools/cmdline.c6
-rw-r--r--source4/lib/ldb/tools/ldbadd.c5
2 files changed, 5 insertions, 6 deletions
diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index c0de314ef1..7589c159d8 100644
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -22,11 +22,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "includes.h"
-#include "ldb/include/includes.h"
-#include "ldb/tools/cmdline.h"
+#include "ldb_includes.h"
+#include "tools/cmdline.h"
#if (_SAMBA_BUILD_ >= 4)
+#include "includes.h"
#include "lib/cmdline/popt_common.h"
#include "lib/ldb/samba/ldif_handlers.h"
#include "auth/gensec/gensec.h"
diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index 8e75bccacc..93147dc715 100644
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -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;