summaryrefslogtreecommitdiffstats
path: root/source/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source/lib')
-rw-r--r--source/lib/samba3/PLAN2
-rw-r--r--source/lib/samba3/samba3.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/source/lib/samba3/PLAN b/source/lib/samba3/PLAN
index f6cdf1cce40..8c1a6735358 100644
--- a/source/lib/samba3/PLAN
+++ b/source/lib/samba3/PLAN
@@ -1,3 +1,3 @@
TODO (SoC project):
- - test ldb_map backend (testsuite?)
+ - finish ldb_map testsuite
- testsuite for the static upgrade
diff --git a/source/lib/samba3/samba3.c b/source/lib/samba3/samba3.c
index 8d5ad771858..b9bb6d73621 100644
--- a/source/lib/samba3/samba3.c
+++ b/source/lib/samba3/samba3.c
@@ -88,9 +88,12 @@ NTSTATUS samba3_read(const char *libdir, const char *smbconf, TALLOC_CTX *ctx, s
ret = talloc_zero(ctx, struct samba3);
- if (smbconf) {
+ if (smbconf != NULL) {
ret->configuration = param_init(ret);
- param_read(ret->configuration, smbconf);
+ if (param_read(ret->configuration, smbconf) == -1) {
+ talloc_free(ret);
+ return NT_STATUS_UNSUCCESSFUL;
+ }
}
dbfile = talloc_asprintf(ctx, "%s/account_policy.tdb", libdir);