diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-08-31 02:39:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:35:04 -0500 |
| commit | f58a74aabab3d5c0d1185ac2f77a5f54feb781e9 (patch) | |
| tree | 79d531450d96f07da379fdd72fb40d1221570627 /source4/lib/samba3 | |
| parent | 40f85ace04abad7460d0f0afe9211c4280482c6c (diff) | |
| download | samba-f58a74aabab3d5c0d1185ac2f77a5f54feb781e9.tar.gz samba-f58a74aabab3d5c0d1185ac2f77a5f54feb781e9.tar.bz2 samba-f58a74aabab3d5c0d1185ac2f77a5f54feb781e9.zip | |
r9816: Work on testsuite for upgrade
Add 'paths' object to provision code.
(This used to be commit 488d737fb0ebbc2535d0ec17c14f0dc1eaf2a578)
Diffstat (limited to 'source4/lib/samba3')
| -rw-r--r-- | source4/lib/samba3/PLAN | 2 | ||||
| -rw-r--r-- | source4/lib/samba3/samba3.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source4/lib/samba3/PLAN b/source4/lib/samba3/PLAN index f6cdf1cce4..8c1a673535 100644 --- a/source4/lib/samba3/PLAN +++ b/source4/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/source4/lib/samba3/samba3.c b/source4/lib/samba3/samba3.c index 8d5ad77185..b9bb6d7362 100644 --- a/source4/lib/samba3/samba3.c +++ b/source4/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); |