summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-08-30 14:44:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:35:03 -0500
commit9f4b32996c1c97122b198a13216c35ad40f6ea2d (patch)
tree192c0096a1bb84f59d349cc841632bf5bdd9372a /source4/lib
parenta3a7881d39d0c294d0cd2ce13203478fb889b07c (diff)
downloadsamba-9f4b32996c1c97122b198a13216c35ad40f6ea2d.tar.gz
samba-9f4b32996c1c97122b198a13216c35ad40f6ea2d.tar.bz2
samba-9f4b32996c1c97122b198a13216c35ad40f6ea2d.zip
r9800: Add EJS interface to param. tridge, sorry this overlaps a bit
with your loadparm interface. :-/ (This used to be commit bb0cef581a09a86113f3212c776c011ae73def14)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/samba3/samba3.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/lib/samba3/samba3.c b/source4/lib/samba3/samba3.c
index d90d5edbfe..b919366ce3 100644
--- a/source4/lib/samba3/samba3.c
+++ b/source4/lib/samba3/samba3.c
@@ -32,15 +32,17 @@ struct samba3_domainsecrets *samba3_find_domainsecrets(struct samba3 *db, const
return NULL;
}
-NTSTATUS samba3_read(const char *smbconf, const char *libdir, TALLOC_CTX *ctx, struct samba3 **samba3)
+NTSTATUS samba3_read(const char *libdir, const char *smbconf, TALLOC_CTX *ctx, struct samba3 **samba3)
{
struct samba3 *ret;
char *dbfile = NULL;
ret = talloc_zero(ctx, struct samba3);
- if (smbconf)
- ret->configuration = param_read(ret, smbconf);
+ if (smbconf) {
+ ret->configuration = param_init(ret);
+ param_read(ret->configuration, smbconf);
+ }
dbfile = talloc_asprintf(ctx, "%s/account_policy.tdb", libdir);
samba3_read_account_policy(dbfile, ctx, &ret->policy);