summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-02-19 14:45:23 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-02-19 14:45:23 +1100
commite51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1 (patch)
tree643566bbcf1312cd9ae1fed9e235d702c7281a8f /source4/dsdb
parent5842df9d0fb71430d1bcda1c4c748589b38ecb00 (diff)
parent9368ea67cdbb0d1fe5ef2258cc7e8c20c66e6ecd (diff)
downloadsamba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.tar.gz
samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.tar.bz2
samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.zip
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 837eb8a0bc011cd84bc7e8d2849028313d709928)
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index de00b401c8..17752fbbbd 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -1,6 +1,6 @@
# Directory Service subsystem
-include samdb/ldb_modules/config.mk
+mkinclude samdb/ldb_modules/config.mk
################################################
# Start SUBSYSTEM SAMDB