summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-10-06 19:34:50 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-10-11 13:41:34 +1100
commitb21b012756dbb9e7022280b34d7103a5dcbea6d6 (patch)
treeda02a819454751095f72dde2235dd05e76c3c966 /source3
parent6bed57788c2341a92e1c4431ea764bf037431254 (diff)
downloadsamba-b21b012756dbb9e7022280b34d7103a5dcbea6d6.tar.gz
samba-b21b012756dbb9e7022280b34d7103a5dcbea6d6.tar.bz2
samba-b21b012756dbb9e7022280b34d7103a5dcbea6d6.zip
lib/param move source4 param code to the top level
This is done so that the lpcfg_ functions are available across the whole build, either with the struct loadparm_context loaded from an smb.conf directly or as a wrapper around the source3 param code. This is not the final, merged loadparm, but simply one step to make it easier to solve other problems while we make our slow progress on this difficult problem. Andrew Bartlett
Diffstat (limited to 'source3')
-rw-r--r--source3/modules/vfs_dfs_samba4.c2
-rw-r--r--source3/param/loadparm_ctx.c2
-rw-r--r--source3/passdb/pdb_samba4.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/modules/vfs_dfs_samba4.c b/source3/modules/vfs_dfs_samba4.c
index 98da9c70bb..a611de8415 100644
--- a/source3/modules/vfs_dfs_samba4.c
+++ b/source3/modules/vfs_dfs_samba4.c
@@ -27,7 +27,7 @@
#include "librpc/gen_ndr/ndr_dfsblobs.h"
#include "source4/lib/events/events.h"
#include "source4/auth/session.h"
-#include "source4/param/param.h"
+#include "lib/param/param.h"
#include "source4/dsdb/samdb/samdb.h"
#include "dfs_server/dfs_server_ad.h"
diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index 15a6a7d29e..8a886551c6 100644
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "../source4/param/s3_param.h"
+#include "lib/param/s3_param.h"
static struct loadparm_service *lp_service_for_s4_ctx(const char *servicename)
{
diff --git a/source3/passdb/pdb_samba4.c b/source3/passdb/pdb_samba4.c
index 01463041e3..5e680ad2a1 100644
--- a/source3/passdb/pdb_samba4.c
+++ b/source3/passdb/pdb_samba4.c
@@ -32,7 +32,7 @@
#include "source4/lib/events/events.h"
#include "source4/auth/session.h"
#include "source4/auth/system_session_proto.h"
-#include "source4/param/param.h"
+#include "lib/param/param.h"
#include "source4/dsdb/common/util.h"
struct pdb_samba4_state {