summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-06-21 20:56:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:31 -0500
commit235a5ae4cdf3ea238728c2e89a4318c18257426a (patch)
tree6a16884de3a4249b898989271ed4c11541637058
parentf075620d2071aaecb72e93cbda32c4f624f23d86 (diff)
downloadsamba-235a5ae4cdf3ea238728c2e89a4318c18257426a.tar.gz
samba-235a5ae4cdf3ea238728c2e89a4318c18257426a.tar.xz
samba-235a5ae4cdf3ea238728c2e89a4318c18257426a.zip
r23575: Fix a segfault when lp_load is called before init_registry.
Michael
-rw-r--r--source/param/loadparm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 5255c95c27f..ed77cfda435 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -3071,6 +3071,7 @@ static struct tdb_wrap *lp_regdb_open(void)
if (!reg_tdb) {
DEBUG(0, ("lp_regdb_open: failed to open %s: %s\n",
lock_path("registry.tdb"), strerror(errno)));
+ goto done;
}
else {
DEBUG(10, ("lp_regdb_open: reg tdb opened.\n"));
@@ -3085,6 +3086,7 @@ static struct tdb_wrap *lp_regdb_open(void)
/* this is apparently not implemented in the tdb */
}
+done:
return reg_tdb;
}